Merge "Improvements to the Gradle DSL resolver" into idea133