XCOMMONS-380: Upgrade to Groovy 2.1.3