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

[Nick Rosbrook]

Review: Approve

Uploaded with usual fixes
-- 
https://code.launchpad.net/~mylesjp/ubuntu/+source/python-oslo.metrics/+git/python-oslo.metrics/+merge/488714
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/python-oslo.metrics:master.