XCOMMONS-445: Upgrade to Groovy 2.1.6