Skip time series field type merge for non-TS agg queries#143262

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

kkrik-es:fix/merge-conflict-without-tskkrik-es/elasticsearch:fix/merge-conflict-without-tsCopy head branch name to clipboard