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

[Nick Rosbrook]

Review: Approve


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