GRAILS-10119 "query caching not working for countBy* method"
Merge branch '2.2.x'

Conflicts:
	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/metaclass/CountByPersistentMethod.java