Merge "Fix behavior where the non-blocking sendToCliend would block when there was enough room for the message but not the message header."