GRAILS-9753 - convert an instance member to static
Merge branch '2.2.x'