Merge branch 'patch/JAL-2754_patch2104forJava8' into develop

No match.