Update version to 2.10.0-SNAPSHOT
Merge remote branch 'origin/2.10.x' into 2.10.x

Conflicts:
	installer