provide longer test timeouts, needed for 1Hz /diagnostics
Merge remote-tracking branch 'origin/master'