fix failing tests
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/DynamicFinderOrTests.groovy
	grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/FindByMethodTests.groovy
	grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/SubquerySpec.groovy