Merge remote-tracking branch 'origin/master' into OZG-3037_elasticsearch_suche

# Conflicts:
#	notification-manager/src/test/java/de/itvsh/kop/notification/user/UserRemoteServiceTest.java

notification-manager/src/test/java/de/itvsh/kop/notification/user/UserRemoteServiceTest.java

@@ -4,13 +4,12 @@ import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+import de.itvsh.kop.user.grpc.recipient.RecipientServiceGrpc.RecipientServiceBlockingStub;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
-import de.itvsh.kop.user.grpc.recipient.RecipientServiceGrpc.RecipientServiceBlockingStub;
-
 class UserRemoteServiceTest {
 
 	@InjectMocks