(Ant build: Can now release SNAPHOST-s on oss.sonatype.org Maven repo)
Merge branch '2.3-gae' into 2.3

Conflicts:
	build.xml