HHH-7942 Corrected OsgiClassLoader.  Minor refactoring.