JAL-3210 merged from develop: build.gradle and gradle.properties