REP-946 Upgrade to Log4j 2.x

These now more closely match the old properties files.