Removed argument from setNoWait and setBlocked
Removed tcpSocket from TcpHandler and handled the 'single' case correctly
without it
branch merge