XCOMMONS-579: Upgrade to Groovy 2.3