Merge branch 'aws-integration-merge-msjangid' into 'master'

Aws integration merge

See merge request !503

(cherry picked from commit 1f9a19bf)

5e55ab4c Allocating more memory to container than JVM heap memory
e5413d11 Merge remote-tracking branch 'origin/master' into master-dev-merge

devops/aws/chart/values.yaml

@@ -69,10 +69,10 @@ environmentVariables:
 replicaCount: 1
 resources:
   limits:
-    memory: 900M
+    memory: 1200M
   requests:
     cpu: 500m
-    memory: 900M
+    memory: 1200M
 autoscaling:
   enabled: true
   minReplicas: 1