Cherry-pick log4j fixes into the release branche

Original MR: !6 (merged)

Part of the #3 (closed) series

Merge request reports

Loading