Fix broken bwc logic in text field mapper introduced by #129126#129308

martijnvg merged 2 commits intoelastic:mainelastic/elasticsearch:mainfrom

martijnvg:fix_broken_bwc_logic_text_fieldmartijnvg/elasticsearch:fix_broken_bwc_logic_text_fieldCopy head branch name to clipboard