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

[Corey Bryant]

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