JCR-2221: Upgrade to Groovy 1.8.9 (code)