Merge master into feature/stabilization branch
Correct the version in the main pom after merging
Merge feature/stabilization into master branch
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ

Conflicts:
	pom.xml