Merge pull request #2338 from allengeorge/thrift-4451

THRIFT-4451 Use a shared TcpStream between both Thrift clients in cross-test