Upgrade to Groovy 2.3.8

Closes gh-2021