XCOMMONS-527: Upgrade to Groovy 2.2.1