CFY-1224 env variables in openstack configuration now don't get overridden by empty values