Try harder to force the server to stop if a deadlock is detected, and recovering from the deadlock fails.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>