[9.0] Merge template mappings properly during validation (#124784)#124997

elasticsearchmachine merged 2 commits intoelastic:9.0elastic/elasticsearch:9.0from

kkrik-es:backport/9.0/pr-124784kkrik-es/elasticsearch:backport/9.0/pr-124784Copy head branch name to clipboard