GROOVY-6276, part 2: Fix outer class property not visible if using getter
GROOVY-6276: Fix unit test on 2.2.X branch