new snapshot version
Merge branch 'master' into 3.2.0

Conflicts:
	pom.xml
	source/test/pom.xml
	test/load/server/pom.xml
	test/load/webservice/pom.xml
	test/performance/server/pom.xml