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

[Corey Bryant]

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