Merge branch 'task/JAL-3934_update_log4j_again' into releases/Release_2_11_1_Branch