Cherry pick log4j fixes into the release/0.12 branch

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

Original MRs: !195 (merged), !196 (merged), !200 (merged)

Part of the #74 (closed) series

Merge request reports