Handle BundleCapability container annotation and duplicate attribute ids