Try to simplify apoptosis/DeleteConnection locking mess.
Merge pull request #1676 from jimis/serverd_deadlock_fix

Try to simplify apoptosis/DeleteConnection locking mess.