add gradle javadoc task memory options to fix occasional mem alloc failures on Travis CI
Merge branch '2.3.x' into 2.4.x
Merge branch '2.4.x'
GRAILS-11631 use repo.grails.org DNS name now since SSL certificate is in place
Merge branch '2.4.x'

Conflicts:
	grails-resources/src/grails/ant/ivysettings.xml