Accommodate hollow engine changes#129535

kingherc merged 11 commits intoelastic:mainelastic/elasticsearch:mainfrom

kingherc:non-issue/ES-11457-fieldinfoskingherc/elasticsearch:non-issue/ES-11457-fieldinfosCopy head branch name to clipboard