GRAILS-9753 - mark inner class as static
Merge branch '2.2.x'