Cherry pick log4j fixes to release/0.12
Original MRs: !199 (merged) and !201 (merged)
(cherry picked from commit c375dd0c)
Part of the #53 (closed) series
Original MRs: !199 (merged) and !201 (merged)
(cherry picked from commit c375dd0c)
Part of the #53 (closed) series