Merge "Remove unused log4j jars"