FELIX-4331 : [Core R5] Support BundleContext and Framework adaptations. Apply patch from David Bosschaert