Merge "Do not archive the logs directory"