Cherry pick log4j updates to release/0.12
Original MRs: !149 (merged) and !157 (merged)
(cherry picked from commit 3e13a733)
Part of the #91 (closed) series
Original MRs: !149 (merged) and !157 (merged)
(cherry picked from commit 3e13a733)
Part of the #91 (closed) series