Merge pull request #4417 from OAI/v3.1-dev-resolve-conflicts

v3.1-dev: resolve conflicts that prevent a direct merge from dev

Author: handrews

CONTRIBUTING.md

@@ -214,11 +214,6 @@ Plus some suggestions, rather than rules:
 * property of a "plain" JSON object that is not an OpenAPI-defined Foo Object -> "property"
 * "attribute" is only used in the XML context and means "XML attribute"
 
-### Field Names and Values in YAML comments
-
-Field names and keywords should be in backticks.
-Values like "Dog" should be double quoted.
-
 ## Release Process and Scope
 
 This section relates to the 3.x versions only.