Fix @CS compilation problems with Groovy 2.1.9-SNAPSHOT
- preparing for 2.1.9
- See GROOVY-6401 for more details about the changes in @CS