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

[mp+471097 at code.launchpad.net]

The proposal to merge ~jadonn/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/~jadonn/ubuntu/+source/heat/+git/heat/+merge/471097
-- 
Your team Ubuntu OpenStack uploaders is requested to review the proposed merge of ~jadonn/ubuntu/+source/heat:master into ~ubuntu-openstack-dev/ubuntu/+source/heat:master.