[Merge] ~james-page/ubuntu/+source/nova:master into ~ubuntu-openstack-dev/ubuntu/+source/nova:master

[mp+459080 at code.launchpad.net]

The proposal to merge ~james-page/ubuntu/+source/nova:master into ~ubuntu-openstack-dev/ubuntu/+source/nova:master has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~james-page/ubuntu/+source/nova/+git/nova/+merge/459080
-- 
Your team Ubuntu OpenStack uploaders is requested to review the proposed merge of ~james-page/ubuntu/+source/nova:master into ~ubuntu-openstack-dev/ubuntu/+source/nova:master.