Merge branch '2.x' of github.com:apache/logging-log4j2 into 2.x