Cherry-pick log4j fixes into the release

David Diederichrequested to merge
cherry-pick-update-log4j into release/0.12

Original MRs: !248 (merged) !252 (merged)

Part of the #48 (closed) series

Merge request reports