Merge branch 'master' into merge-hotfix

# Conflicts:
#	bescheid-manager/pom.xml
#	pom.xml
#	vorgang-manager-base/pom.xml
#	vorgang-manager-command/pom.xml
#	vorgang-manager-interface/pom.xml
#	vorgang-manager-server/pom.xml
#	vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
#	vorgang-manager-utils/pom.xml