XCOMMONS-331: Upgrade to Groovy 2.1.0