Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update log4j2 version to 2.17.0
  Update log4j2 version to 2.16.0 to fix CVE-2021-44228


Change-Id: Id6f7e2cefd185136464180f685bbbe6d6a0e4cd4