Cherry picks for log4j fixes

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

Original MRs: !153 (merged) and !157 (merged)

Part of the #36 (closed) series

Merge request reports