HHH-7942 Moved o.h.osgi.internal to o.h.osgi
HHH-7941 Multiple manifest fixes found during Karaf integration