Merge "Adjust upgrade openstack control according to latest changes"