Fix test bug when testing the merging of mappings and templates.#38021

jpountz merged 2 commits intoelastic:masterelastic/elasticsearch:masterfrom

jpountz:fix/test_bug_template_mapping_mergejpountz/elasticsearch:fix/test_bug_template_mapping_mergeCopy head branch name to clipboard