Merge remote-tracking branch 'origin/2.0.x-updates' into 2.0.x-updates

# Conflicts:
#	crss-audit/crss-audit-pemc-uat-default.yml
#	crss-dataflow-app/crss-dataflow-app-pemc-uat-default.yml
#	crss-dataflow-app/crss-dataflow-app-pemc-uat-sit.yml
#	crss-datainterface-task-ingest/crss-datainterface-task-ingest-pemc-uat-sit.yml
#	crss-meterprocess-app/crss-meterprocess-app-pemc-uat-default.yml
#	crss-meterprocess-app/crss-meterprocess-app-pemc-uat-sit.yml
#	crss-meterprocess-app/crss-meterprocess-app-pemc-uat.yml
#	crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-pemc-uat-default.yml
#	crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-pemc-uat-sit.yml
#	crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-pemc-uat-sit.yml
#	crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-uat-default.yml
#	crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-uat-sit.yml
#	crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-pemc-uat-default.yml
#	crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-pemc-uat-sit.yml
#	crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-pemc-uat-sit.yml
#	crss-mq-computation/crss-mq-computation-dev2.yml
#	crss-mq-computation/crss-mq-computation-pemc-uat-sit.yml
#	crss-mtr/crss-mtr-pemc-uat-sit.yml
#	crss-settlement-app/crss-settlement-app-pemc-uat-default.yml
#	crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-pemc-uat-default.yml
#	crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-pemc-uat.yml
#	crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-default.yml
#	crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-sit.yml
#	crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-pemc-uat-default.yml
#	crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-pemc-uat.yml
#	crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat-default.yml
#	crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat-sit.yml
#	crss-settlement-task-validation/crss-settlement-task-validation-pemc-uat-default.yml
#	ui-bsmd/ui-bsmd-pemc-uat-default.yml

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-pemc-uat.yml

@@ -1,30 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_settlement
-      username: crss_settlement
-      password: crss_settlement
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl