Upgrade Gradle to version 2.2.1
Other gradle changes to use maven dependencies