Cherry-pick log4j fixes to release/0.12

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

Original MR: !120 (merged)

Part of the #18 (closed) series

Merge request reports