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

[Corey Bryant]

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