fix for GRAILS-9696 "Some integration testing that involves GormStaticApi calls is broken"
Merge branch 'master' of github.com:SpringSource/grails-data-mapping