[Merge] ~mylesjp/ubuntu/+source/python-glance-store:master into ~ubuntu-openstack-dev/ubuntu/+source/python-glance-store:master

[Nick Rosbrook]

Review: Approve

Merged and uploaded with .launchpad.yaml fixup.
-- 
https://code.launchpad.net/~mylesjp/ubuntu/+source/python-glance-store/+git/python-glance-store/+merge/488923
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/python-glance-store:master.