Various schema fixes (#3973)#4014

miguelgrinberg merged 1 commit intoelastic:9.0elastic/elasticsearch-specification:9.0from

miguelgrinberg:backport-3973-to-9.0miguelgrinberg/elasticsearch-specification:backport-3973-to-9.0Copy head branch name to clipboard