Merging from quantum.
Merging from quantum.

wolverineav/networking-bigswitch,stackforge/networking-bigswitch,openstack/networking-bigswitch,stackforge/networking-bigswitch,wolverineav/networking-bigswitch,openstack/networking-bigswitch