DONT MERGE: Log4j 2.x support (issue #2345)