The original changes are at https://review.openstack.org/#/c/193590/ Change-Id: I032423e7ca65b8bb280b53e4b254e6660b5dd69b