3.1.1: port the undisputed parts of #2140#4071

lornajane merged 1 commit intoOAI:v3.1.1-devOAI/OpenAPI-Specification:v3.1.1-devfrom

ralfhandl:3.1.1-rework-pr-#2140ralfhandl/OpenAPI-Specification:3.1.1-rework-pr-#2140Copy head branch name to clipboard