Merge "define api version during openstack-env-creation"