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

[Corey Bryant]

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