STS-3433: clean up dependencies to OSGi feature