Restore usage of DynamicReference in test service proxy.
Add sanity check in DynamicReference when service gets unbound while waiting.
Align SeviceLocator timeout with that of ServiceProxy