Merge branch '2.0.x' into 2.1.x

crss-settlement-task-validation/crss-settlement-task-validation-dev2.yml

@@ -35,6 +35,9 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+  profiles:
+    include: mesos
+    
   cloud:
     deployer:
       mesos: