fix failing tests
Merge branch '2.3.x'

Conflicts:
	grails-bootstrap/src/test/groovy/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy