STS-3822: improved recovery
Merge branch 'master' of https://github.com/groovy/groovy-eclipse