GRAILS-10092 - fix failing functional tests
Merge branch 'master' of git://github.com/grails/grails-core