fix erroneous osgi support merge