XD-2518 Upgrade to Gradle 2.2