HHH-8232 - Upgrade to Gradle 1.6