GRAILS-10790 - improve binding to typed Maps on non domain classes
Merge branch '2.3.x'