Cherry-pick log4j fixes into release/0.12

Original MR: !144 (merged)

Part of the #34 (closed) series

Merge request reports

Loading