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

[Nick Rosbrook]

Review: Approve

Uploaded with .launcpad.yaml fixup.
-- 
https://code.launchpad.net/~mylesjp/ubuntu/+source/cloudkitty/+git/cloudkitty/+merge/489150
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/cloudkitty:master.