Tweaks to aid Gradle for module builds in Jenkins