Merge branch 'critical/JAL-3933_log4j_update_for_develop_branch' into develop