Merge "Replace “CapabilityBoundingSet=” line instead of appending"