Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: 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: Ibabc46731db7b2731682f79fbd4773fc5a25f8dd