REP-946 Upgrade to Log4j 2.x

We could then take the matcher and put it someplace common.