Further fixes for IdForCorrelation, MessageId and CorrelationId

What is missing here is using the correlation ID for identifiying the callbacks and also there is a TODO left in the TransportMessage which can be safely removed as discussed with @andreasohlund