Cherry-pick log4j fixes into release/0.12

Original MR: !197 (merged)

(cherry picked from commit 341f15f1)

Part of the #84 (closed) series

Merge request reports

Loading