Merge remote-tracking branch 'origin/es-query' into es-query

Author: alexwizp

src/plugins/kibana_utils/public/field_mapping/mapping_setup.ts

@@ -25,7 +25,7 @@ import { ES_FIELD_TYPES } from '../../../data/public';
 type ShorthandFieldMapObject = FieldMappingSpec | ES_FIELD_TYPES | 'json';
 
 const json: FieldMappingSpec = {
-  type: ES_FIELD_TYPES.TEXT,
+  type: 'text' as ES_FIELD_TYPES,
   _serialize(v) {
     if (v) return JSON.stringify(v);
   },

x-pack/legacy/plugins/ml/common/types/fields.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
+import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
 import {
   ML_JOB_AGGREGATION,
   KIBANA_AGGREGATION,