Merge "Limit log archive pattern to top-level directory"