Merging fixes for heat-plugin into master

Change-Id: I84bc0c85c469580992939c0e8d90954f1f8794d1
Related-PROD: PROD-32143
diff --git a/tempest/tempest_ext.conf b/tempest/tempest_ext.conf
index cc28635..5a73965 100644
--- a/tempest/tempest_ext.conf
+++ b/tempest/tempest_ext.conf
@@ -20,6 +20,7 @@
 project_name = ${OS_TENANT_NAME}
 admin_project_name = ${OS_TENANT_NAME}
 region = ${OS_REGION_NAME}
+auth_version = 3
 auth_url = ${OS_AUTH_URL}
 project_domain_name = Default
 user_domain_name = Default
@@ -30,8 +31,8 @@
 floating_network_name = ${PUBLIC_NET}
 fixed_subnet_name = ${FIXED_SUBNET_NAME}
 disable_ssl_certificate_validation = True
-image_ref = ${IMAGE_REF2}
-minimal_image_ref = ${IMAGE_REF2}
+image_ref = ${IMAGE_NAME2}
+minimal_image_ref = ${IMAGE_NAME2}
 fixed_network_name = ${FIXED_NET}
 build_timeout = 180
 ssh_timeout = 30