Use mafmt module to only append peer ids to certain multiaddrs

[achingbrain]

As part of startup we append our peer id to every multiaddr that contains a peer id.

This should only happen to circuit addresses. We should use the mafmt module to match on those.