Align SeviceLocator timeout with that of ServiceProxy