[Merge] ~mfo/ubuntu/+source/nova:lp1960758-ussuri into ~ubuntu-openstack-dev/ubuntu/+source/nova:stable/ussuri

[Corey Bryant]

This is merged into the git branches for stable/victoria and stable/ussuri.
-- 
https://code.launchpad.net/~mfo/ubuntu/+source/nova/+git/nova/+merge/447799
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/nova:stable/ussuri.