Cherry pick log4j fixes into the release branch
Original MRs: !18 (merged) and !19 (merged)
(cherry picked from commit 3991965c)
Part of the #5 (closed) series
Original MRs: !18 (merged) and !19 (merged)
(cherry picked from commit 3991965c)
Part of the #5 (closed) series