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

[mp+459058 at code.launchpad.net]

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

    Status: Needs review => Merged

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