[Merge] ~corey.bryant/ubuntu/+source/nova:stable/zed into ~ubuntu-openstack-dev/ubuntu/+source/nova:stable/zed

[Corey Bryant]

Superseded by https://code.launchpad.net/~corey.bryant/ubuntu/+source/nova/+git/nova/+merge/442892
-- 
https://code.launchpad.net/~corey.bryant/ubuntu/+source/nova/+git/nova/+merge/436450
Your team Ubuntu OpenStack uploaders is requested to review the proposed merge of ~corey.bryant/ubuntu/+source/nova:stable/zed into ~ubuntu-openstack-dev/ubuntu/+source/nova:stable/zed.