Upgrade to Groovy 2.2.0-beta-2