Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Update log4j2 version to 2.17.0 Update log4j2 version to 2.16.0 to fix CVE-2021-44228 Update JGit dependency to align with core's version Change-Id: I64f1aa2c0213c4c5bd84e218184723049f86ca4b