Make sure to validate the type before attempting to merge a new mapping.#45157

jtibshirani merged 5 commits intoelastic:masterelastic/elasticsearch:masterfrom

jtibshirani:mapping-merge-errorjtibshirani/elasticsearch:mapping-merge-errorCopy head branch name to clipboard