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

handrews merged 7 commits intov3.1-devOAI/OpenAPI-Specification:v3.1-devfrom

v3.1-dev-resolve-conflictsOAI/OpenAPI-Specification:v3.1-dev-resolve-conflictsCopy head branch name to clipboard