Most trustworthy ServiceDiscoveryManager?

[Patricia Shanahan]

I tried dropping my new TaskManager into a build based on Peter's pepe 
branch, and it is getting a couple of failures. The one that I'm 
analyzing appears to be related to some of the messier SDM code. That 
does not exclude the possibility that it is ultimately a TaskManager 
bug, but I would like to minimize the risk that it is an SDM bug.

There are currently two lines other lines of development, Peter's pepe 
branch, and Jonathan's attempts to get the trunk stable.

Which of those has the more solid SDM?

Thanks for any advice,

Patricia