GRAILS-11238 - fix binding to a property which hides a field of a different type
Merge branch '2.3.x'