Cherry-pick log4j fixes into release/0.12
Original MRs: !117 (merged), !122 (merged), and !123 (merged)
(cherry picked from commit 146b5126)
Part of the #24 (closed) series
Original MRs: !117 (merged), !122 (merged), and !123 (merged)
(cherry picked from commit 146b5126)
Part of the #24 (closed) series