Minor improvements to java-gradle-plugin