Merge "Use assertLessEqual for downtime validation"