Merge "Reduce number of logs kept for merge and periodic jobs"