Fix a race in proxy.

addService() eventually calls getServiceInfo(), but the serviceInfo object may
not be installed yet (race).
Merge pull request #1037 from thockin/proxy

Fix a race in proxy.