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

[Corey Bryant]

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