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

[Corey Bryant]

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