Merge "Fix naming conflict in vLB/vDNS Heat template"