[fedora-java] Rebase of log4j with bigger changes