[Merge] ~corey.bryant/ubuntu/+source/networking-odl:master into ~ubuntu-openstack-dev/ubuntu/+source/networking-odl:master

[Corey Bryant]

Superseded by https://code.launchpad.net/~corey.bryant/ubuntu/+source/networking-odl/+git/networking-odl/+merge/439551
-- 
https://code.launchpad.net/~corey.bryant/ubuntu/+source/networking-odl/+git/networking-odl/+merge/438110
Your team Ubuntu OpenStack uploaders is requested to review the proposed merge of ~corey.bryant/ubuntu/+source/networking-odl:master into ~ubuntu-openstack-dev/ubuntu/+source/networking-odl:master.