Cherry-pick log4j updates into the release branch

Original MR: !173 (merged)

Part of the #15 (closed) series

Merge request reports

Loading