Merge branch 'dev' into 5509-entryDms

Jenkinsfile

@@ -77,14 +77,10 @@ pipeline {
             }
               post {
                 always {
-                    script {
+                    junit(
-                        try {
+                        testResults: 'junitresults.xml',
-                            junit 'junitresults.xml'
+                        allowEmptyResults: true
-                            junit 'junit.xml'
+                    )
-                        } catch (e) {
-                            echo e.toString()
-                        }
-                    }
                 }
             }
         }