Merging the Cisco branch.
Merging the Cisco branch.

stackforge/networking-mlnx,openstack/networking-mlnx,openstack/networking-mlnx,moshele/networking-mlnx,moshele/networking-mlnx-master,stackforge/networking-mlnx