Fix context cleanup for the case we have a duplicate client.
Fix context cleanup for the case we have a duplicate client.

zlargon/mosquitto,zlargon/mosquitto,zlargon/mosquitto,zlargon/mosquitto,zlargon/mosquitto