Merge branch 'trusted-ado-codemerge' into 'master'

GCP new line bug fix

See merge request !23

.gitlab-ci.yml

@@ -22,7 +22,7 @@ include:
     file: "standard-setup.yml"
   - project: "osdu/platform/ci-cd-pipelines"
     file: "build/maven.yml"
-  - project: "osdu/platform/ci-cd-pipelines"
+  - project: 'osdu/platform/ci-cd-pipelines'
     ref: "master"
     file: "cloud-providers/azure.yml"
   - project: 'osdu/platform/ci-cd-pipelines'
@@ -35,7 +35,6 @@ include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "scanners/gitlab-ultimate.yml"
 
-
 compile-and-unit-test:
   variables:
     GOOGLE_CLOUD_PROJECT: opendes-evt

provider/legal-gcp/src/main/appengine/app.yaml

@@ -34,3 +34,4 @@ handlers:
 
 env_variables:
    SPRING_PROFILES_ACTIVE: "ENVIRONMENT"
+   
\ No newline at end of file