merged in cherry-picked service discovery changes

2009-08-12, b taylor