Merge tag 'v2.5.1' into develop

2.5.1

Author: LEDfan

pom.xml

@@ -26,7 +26,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<containerproxy.version>0.8.9-SNAPSHOT</containerproxy.version>
+		<containerproxy.version>0.8.10-SNAPSHOT</containerproxy.version>
 		<resource.delimiter>&amp;</resource.delimiter>
 	</properties>