fixes from Openstack review comments and tempest tests