Merge pull request #6948 from keymanapp/fix/developer/cherry-pick/6897-timeouts-when-server-shutdown fix(developer): reduce timeouts if server shut down 🎾 🍒