Merge branch 'master' into OZG-6810-FileManager-Dateiinhalt-ersetzen-proto

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

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java

@@ -326,7 +326,9 @@ class CollaborationITCase {
 
 				waitUntilCommandHasStatus(command.getId(), CommandStatus.ERROR);
 
-				await().atMost(70, TimeUnit.SECONDS).untilAsserted(() -> assertThat(loadCollaborationRequest(vorgangId)).isEmpty());
+				await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> {
+					assertThat(loadCollaborationRequest(vorgangId)).isEmpty();
+				});
 			}
 		}