[2/6] activemq git commit: AMQ-6858 - reworking durable subscription propagation fix

AMQ-6858 - reworking durable subscription propagation fix Significantly reworking previous fix so that the client id is properly changed when tracking network proxy subscriptions. This makes it so removal is done properly (cherry picked from commit 41211c78d19b545a2352584d3598346aa3705be4)

activemq git commit: AMQ-6858 - reworking durable subscription propagation fix

Repository: activemq Updated Branches: refs/heads/master a0a23b99c -> 41211c78d AMQ-6858 - reworking durable subscription propagation fix Significantly reworking previous fix so that the client id is properly changed when tracking network proxy subscriptions. This makes it so removal is done