Merge "[COMMON] Correct Ingress template to create Istio GW/VS" into kohn