Merge branch 'refs/heads/master' into OZG-6259-Anlegen-einer-ZusammenarbeitAnfrage-Edit-Add-comment-Assign-More-IN-PROGRESS-Export

# Conflicts:
#	Jenkinsfile
#	vorgang-manager-server/pom.xml