ERP-339 - did the socket teardown first before canceling the consumer.  ...

...That should tear down the socket first from the client side, and force us not to get stuck in close_wait.