Added comments to new/changed OSGi-related code