ISPN-3850 made OsgiClassLoader singleton, held Bundle references are
weak
ISPN-800 cleanup