Cleanup Instantiate vLB

Remmove vLB Hack since vLBMS doesnt need it
Move vLB service to use vLBMS Heat template

Issue-ID: INT-1039
Change-Id: If92bbec8579305aecddd698257c4e3e6af52b76b
Signed-off-by: Brian Freeman <bf1936@att.com>
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 8830fe1..cbaba4a 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -714,8 +714,8 @@
     [Documentation]   looks up vnf key from service mapping for a regex on groupName and service_name
     [Arguments]   ${group_name}    ${service_name}
     ${vnf}=   Set Variable If
-    ...                      ('${service_name}'=='demoVFWCL') and ('base_vfw' in '${group_name}')   vFWSNK
-    ...                      ('${service_name}'=='demoVFWCL') and ('base_vpkg' in '${group_name}')   vPKG
+    ...                      ('${service_name}'=='demoVFWCL') and ('base_vfw' in '${group_name}')   vFWCLvFWSNK
+    ...                      ('${service_name}'=='demoVFWCL') and ('base_vpkg' in '${group_name}')   vFWCLvPKG
     ...                      ('${service_name}'=='demoVLB') and ('base_vlb' in '${group_name}')   vLB
     [Return]   ${vnf}
 Checkin ASDC Catalog Resource