Also stabilize new shutdown tests on slow machines (valgrind) (cherry picked from commit 8aa083bd)
Attach a file by drag & drop or click to upload