Issue #2851225 by Sam152, Gábor Hojtsy: Ensure non-configuration bundles are correctly removed when the bundles go away