More memory for the Ant build
JDK layout fixed for Mac
Buildserver auto merge