JAL-3210 Bringing in improvements to build.gradle