Move the place the clientId is stripped from outgoing message so monitoring callbacks can access it (related to #302)

I've had a look and indeed the ``Connection#deliver`` method is only called for non meta publish, so there you go.