Cherry-pick 'Update log4j again' into 'release/0.12'

This cherry-pick combines two MRs that targeted the default branch: !3 (merged) and !4 (merged)

(cherry picked from commit 21c446bc)

This is part of the #2 (closed) series