AMQP-338 Polishing

Reinstate cancelled.set(true) for cases where stop() is called
after a consumer thread exception (restart or abort).