Revert "Proposal to remove OSGi dependencies from the CCSDK project"