Pass Discover::Client around rather than RPCClient

Signed-off-by: Lewis Marshall <lewis@lmars.net>
Keep registered services online until unregistered

Signed-off-by: Lewis Marshall <lewis@lmars.net>