Cherry pick log4j fixes into release/0.12

Original MRs: !140 (merged), !141 (merged)

(cherry picked from commit f2eaec86)

Part of the #33 (closed) series