XCOMMONS-655: Upgrade to Groovy 2.3.7