Remove of dependency of BundleContext on Aggregator Implementation

This contains changes being ported from #96