Ensure shutdown is always fast and not blocked on long running actions

[msfstef]

We have observed shutdowns taking an unreasonably long time, making controlled restarts really unpredictable. This needs investigation and resolution through potentially more aggressive killing of things that we can tolerate killing.