Merge template mappings properly during validation#124784

kkrik-es merged 3 commits intoelastic:mainelastic/elasticsearch:mainfrom

kkrik-es:fix/123372kkrik-es/elasticsearch:fix/123372Copy head branch name to clipboard