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

[Corey Bryant]

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