Merge master into feature/stabilization branch
Correct the version in the main pom after merging
Merge feature/stabilization into master branch
Merge branch 'master' into feature/upgrade-gatein-3.7.x-temp

Conflicts:
	pom.xml