Upgrade to groovy 2.2.0 - gradlew clean required