Prepare the ground for being Gradle 1.11 compliant.
Upgrade to Gradle 1.11.
Merge branch 'master' into jdk7