additional test: @CompileStatic with @Singleton
GROOVY-6909: @CompileStatic in combo @WithXXXLock transform is broken
Merge branch 'GROOVY_2_3_X' of https://github.com/groovy/groovy-core into GROOVY_2_3_X