429730 Make ServiceLoader mechanism work with OSGi