Various fixes

Conflicts:
	dev/change-version-to-2.10.sh
	dev/change-version-to-2.11.sh
Small fix in pom file