ISPN-3849 improved ServiceFinder, replaced all direct uses of
ServiceLoader