updates to match the patchset for https://review.openstack.org/#/c/123100