Improve client queue handling at shutdown.

 - Don't ack requeued messages (missing return seems like it was a bug).
 - More logging around this event.