Merge remote-tracking branch 'origin/master' into refactorUserManagerUrlHandling

# Conflicts:
#	alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceDeserializer.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/common/AbstractLinkedResourceSerializer.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/common/DeserializerHelper.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/common/ModelBuilderFactory.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/common/SerializerHelper.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/common/UserProfileUrlProvider.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerProperties.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerUnavailableException.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieModelAssembler.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarModelAssembler.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangModelAssembler.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessor.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessor.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageModelAssembler.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedResourceTestObject.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/common/LinkedUserProfileResourceSerializerTest.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/common/ModelBuilderFactoryTest.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/common/UserProfileUrlProviderTestFactory.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieModelAssemblerTest.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarModelAssemblerTest.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangControllerTest.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangModelAssemblerTest.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessorTest.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessorTest.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageModelAssemblerTest.java