XCOMMONS-598: Upgrade to Groovy 2.3.3