Cherry pick log4j fixes to release branch

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

Original MR: !311 (merged) and !312 (merged)

Part of the #102 (closed) series

Merge request reports