Try to simplify apoptosis/DeleteConnection locking mess.
Merge pull request #1677 from jimis/serverd_deadlock_fix-3.6.x

Serverd deadlock fix 3.6.x