Merge branch 'patch/JAL-2116_java9_antjnlpfix' into develop