REP-1393 Adding Log4J 2.x test coverage and fixing all the things.