Restored log4j dep.
Merged logging-log4j from upstream/fix-logging.