Fixes for OSGi framework version update