Minior changes to manage openstack expectations