GRAILS-11846 workaround for GROOVY-6151
- overridden equals method doesn't get called in dynamic groovy code without this workaround
GRAILS-11846 fix NPE in AbstractTypeConvertingMap.equals method with null values
Merge branch '2.3.x' into 2.4.x