Merged ServiceLocator and ServiceLocatorFused
slightly better contact handling for #217