Merge branch '2.6.x'

crss-dataflow-app/crss-dataflow-app-pemc-dev.yml

@@ -36,5 +36,5 @@ sftp:
 
 scheduler:
   job-execution-timeout-minutes:
-    default: 180
+    default: 360