CB-7601 Build fails due to capabilities with m: prefixes are incorrectly sorted