Merge "Remove log4j jar file"