(Use external mvn command instead of Ant task, as we need Maven 3.x)
Merge branch '2.3-gae' into 2.3