
Also stabilize new shutdown tests on slow machines (valgrind) (cherry picked from commit d89ae2d7ab3f6d181689b2546f2784b574d9b80e)
Also stabilize new shutdown tests on slow machines (valgrind) (cherry picked from commit d89ae2d7ab3f6d181689b2546f2784b574d9b80e)