merge in discovery based content routing changes. moved mock discovery to a new file.
merge in discovery based content routing changes. moved mock discovery to a new file.

ipfs/go-libp2p,libp2p/go-libp2p,libp2p/go-libp2p