Issue #20729 Change Discovery Doc and JSON-Schema to only include the natural OR primay key, not both.