merge latest quantum branch and resolve conflicts
merge latest quantum branch and resolve conflicts

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