Added optional timeout to SocketHandler.makeSocket (SF #1695948)