Merge "[SDNC] Fix service template for ServiceMesh case"