Merge branch 'master-v2' into feature/UIMA-6227-Upgrade-to-xmlunit-2

* master-v2:
  [NO JIRA] Fix Jenkinsfile
  [NO JIRA] Fix Jenkinsfile