version 2.1.6
Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
Merge branch '2.2.x'