Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Ica91950a62efe378b491af8e53fc6ac873c6f179