update to hibernate plugin 3.6.10.14
Merge branch '2.3.x'

Conflicts:
	gradle/assemble.gradle
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy