Merge "Clean up history files via job vs multiple alarms" into tm-qpr-dev