Merge from ecomp 718fd196 - Modern UI

Issue-ID: VID-378

Change-Id: I2736b98426e324ec3aa233b034229ba84d99839f
Signed-off-by: Ittay Stern <ittay.stern@att.com>
diff --git a/vid-webpack-master/cypress/integration/iFrames/searchExistingInstance.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/searchExistingInstance.e2e.ts
index 22e7a99..0e68930 100644
--- a/vid-webpack-master/cypress/integration/iFrames/searchExistingInstance.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/searchExistingInstance.e2e.ts
@@ -35,7 +35,7 @@
         "serviceInstanceId":SERVICE_INSTANCE_ID,
         "globalCustomerId": SUBSCRIBER_ID,
         "serviceType": SERVICE_TYPE,
-        "serviceInstanceName": "abc_mdns_2017_1011_IST_Service_CSI",
+        "serviceInstanceName": "abc_CHARLOTTE_2017_1011_IST_Service_CSI",
         "subscriberName": SUBSCRIBER_NAME,
         "aaiModelInvariantId": SERVICE_MODEL_INVARIANT_ID,
         "aaiModelVersionId": SERVICE_MODEL_VERSION_ID,