Merge branch 'patch/JAL-2116_java9' into releases/Release_2_10_2_Branch