Merge "Added test-harness timeout check" into devel/master