Merge branch 'stable-3.1' * stable-3.1: 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: I29bb066bae4bf5879da3bbd4765c8683dda8b4f7