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

[Corey Bryant]

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