Or I could reduce the shutdown timeout to 0 which would give us a max tolerance of 1s.  But that still feels like it might not be enough for our CI env.