Merge branch 'hotfix-1.4.1' into develop

Conflicts:
	build.xml
	client/pom.xml
	commons/pom.xml
	core/pom.xml
	distributed/pom.xml
	distribution/pom.xml
	enterprise/pom.xml
	graphdb/pom.xml
	nativeos/pom.xml
	object/pom.xml
	pom.xml
	server/pom.xml
	tests/pom.xml
	tools/pom.xml