a collection of fixes related to openstack CR