XCOMMONS-619: Upgrade to Groovy 2.3.4