Merge topic 'longer-test-timeouts'

ba6f952d Force tests to run in serial
f14f2712 Add higher timeouts for some long running tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !135