BUG-9218: fix features to not duplicate upstream bundles