Merge from trunk Fix for TRQ-1447: Desadlock in server under load.