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

[Nick Rosbrook]

Review: Approve


-- 
https://code.launchpad.net/~mylesjp/ubuntu/+source/python-keystoneclient/+git/python-keystoneclient/+merge/492647
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/python-keystoneclient:master.