Fix usage of id() and super() methods in Docker apps

Change-Id: Ieb34aee28b796adfceebca0c825d05de02cf37ac
Closes-Bug: #1593682
(cherry picked from commit 1d0fc0a3e0)

Applications/Grafana/package/Classes/DockerGrafana.yaml

@@ -50,7 +50,7 @@ Methods:
   deploy:
     Body:
       - $.influxDB.deploy()
-      - $.super($.deploy())
+      - super($, $.deploy())
 
 
   getContainer:

Applications/GuestBook/package/Classes/GuestBook.yaml

@@ -56,7 +56,7 @@ Methods:
           publish => false,
           redisMaster => $this.redisMaster)
       - $.redisSlave.deploy()
-      - $.super($.deploy())
+      - super($, $.deploy())
 
 
   getContainer:

Applications/Orion/package/Classes/DockerOrion.yaml

@@ -39,7 +39,7 @@ Methods:
   deploy:
     Body:
       - $.mongodb.deploy()
-      - $.super($.deploy())
+      - super($, $.deploy())
 
   getContainer:
     Body:

DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml

@@ -273,7 +273,7 @@ Methods:
       - applicationName:
           Contract: $.string().notNull()
     Body:
-      - Return: format('{0}-{1}', $applicationName, $.id())
+      - Return: format('{0}-{1}', $applicationName, id($))
 
 
   _removeApplicationEndpoints:
@@ -305,4 +305,4 @@ Methods:
 
   getInternalScopeId:
     Body:
-      Return: $.id()
+      Return: id($)

Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml

@@ -311,7 +311,7 @@ Methods:
 
   getInternalScopeId:
     Body:
-      Return: $.kubernetesCluster.id()
+      Return: id($.kubernetesCluster)
 
   scalePodDown:
     Usage: Action