XCOMMONS-370: Upgrade to Groovy 2.1.2