[8.x] Merge template mappings properly during validation (#124784)#124996

elasticsearchmachine merged 2 commits intoelastic:8.xelastic/elasticsearch:8.xfrom

kkrik-es:backport/8.x/pr-124784kkrik-es/elasticsearch:backport/8.x/pr-124784Copy head branch name to clipboard