making the AETHER-2304 changes for the aether-1.5 branch
also updating with latest aether-roc-api and aether-roc-gui from aether-1.5 branch

Change-Id: I27fd8c5389536747279d910dc05ae97889b07350
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index bcd17fc..7e77703 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -47,8 +47,6 @@
     v3:
       enabled: true
   sdcore-adapter:
-    v2_1:
-      enabled: true
     v3:
       enabled: true
   subscriber-proxy:
@@ -76,7 +74,7 @@
 aether-roc-api: {}
 
 # Aether ROC GUI
-aether-roc-gui-v3:
+aether-roc-gui:
   websocket:
     proxyEnabled: true
   grafana:
@@ -86,19 +84,13 @@
     proxyEnabled: true
     service: aether-roc-umbrella-prometheus-server
 
-# SD-Core Adapter
-sdcore-adapter-v21:
-  nameOverride: sdcore-adapter-v21
-  fullnameOverride: sdcore-adapter-v21
-  prometheusEnabled: false
-
 # Subscriber Proxy
 subscriber-proxy:
   nameOverride: subscriber-proxy
   fullnameOverride: subscriber-proxy
   prometheusEnabled: false
 
-sdcore-adapter-v3:
+sdcore-adapter:
   nameOverride: sdcore-adapter-v3
   fullnameOverride: sdcore-adapter-v3
   prometheusEnabled: false