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