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

[Corey Bryant]

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