XCOMMONS-413: Upgrade to Groovy 2.1.5