Merge "discovery: change Advertise() to return done channel"