server/state: Tweak synchronization to avoid deadlocks at shutdown
server/state: Tweak synchronization to avoid deadlocks at shutdown

celeron55/buildat,celeron55/buildat,celeron55/buildat,celeron55/buildat