Merge branch 'develop' into task/JAL-3991_check_actual_JAVA_VERSION_against_build_pro...