HHH-8095 & HHH-8096: Re-work the OSGi class loading concepts