Merge remote-tracking branch 'origin/release'

# Conflicts:
#	pom.xml
#	vorgang-manager-base/pom.xml
#	vorgang-manager-command/pom.xml
#	vorgang-manager-interface/pom.xml
#	vorgang-manager-server/pom.xml
#	vorgang-manager-utils/pom.xml

vorgang-manager-server/pom.xml

@@ -405,7 +405,7 @@
 					<mainClass>de.ozgcloud.vorgang.VorgangManagerServerApplication</mainClass>
 					<image>
 						<env>
-							<BPE_DELIM_JAVA_TOOL_OPTIONS xml:space="preserve"></BPE_DELIM_JAVA_TOOL_OPTIONS>
+							<BPE_DELIM_JAVA_TOOL_OPTIONS xml:space="preserve"> </BPE_DELIM_JAVA_TOOL_OPTIONS>
 							<BPE_APPEND_JAVA_TOOL_OPTIONS>-Dfile.encoding=UTF-8</BPE_APPEND_JAVA_TOOL_OPTIONS>
 							<BPE_APPEND_LC_ALL>en_US.UTF-8</BPE_APPEND_LC_ALL>
 						</env>