Merge "[COMMON] Network-name-gen and dgbuilder ServiceMesh compatibility"