Bring memory settings down for testing
Merge branch 'master' into rc2_dev

Conflicts:
	grails-app/conf/BuildConfig.groovy
Fix test not compiling.

There's still one test failure here.