only use mavenLocal() for non-CI builds
Merge branch '2.1.x' into 2.2.x
use groovy 2.0.7
Merge branch '2.2.x'

Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java