backport reconciling change from 2.2 to 2.1
Merge branch 'master' of https://github.com/groovy/groovy-eclipse
fix test to run on 2.1 and 2.2