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

[Corey Bryant]

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