Merging the Cisco branch.
Merging the Cisco branch.

openstack/networking-plumgrid,stackforge/networking-plumgrid,openstack/networking-plumgrid,fawadkhaliq/networking-plumgrid,stackforge/networking-plumgrid,msagheer/networking-plumgrid,msagheer/networking-plumgrid,fawadkhaliq/networking-plumgrid