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

tempbottle/mosquitto,tempbottle/mosquitto,tempbottle/mosquitto,tempbottle/mosquitto,tempbottle/mosquitto