Use Spring 4.1.3
Merge branch '2.5.x'

Conflicts:
	grails-bootstrap/src/main/groovy/org/grails/dependency/resolution/GrailsCoreDependencies.java