REP-946 Upgrade to Log4j 2.x

This was identified by IntelliJ IDEA as a duplicate. Since I was there, I fixed it.
Should I put it back here and then make it a separate pull request against master?