Merge pull request #2373 from akoeplinger/servicemodel-tcpreplychannel-race