Merge remote-tracking branch 'remotes/origin/develop' into epic-summary_reformat

Jenkinsfile

-timeout(45) {
-    node('local') {
+node('local') {
+    timeout(45) {
         try {
 
             stage('Init') {
@@ -42,4 +42,4 @@ timeout(45) {
             throw e
         }
     }
-}
\ No newline at end of file
+}