XCOMMONS-704: Upgrade to Groovy 2.3.8