Merge remote-tracking branch 'elastic/master' into pr/38231

* elastic/master:
  AwaitsFix testAbortedSnapshotDuringInitDoesNotStart (elastic#38227)
  Preserve ILM operation mode when creating new lifecycles (elastic#38134)
  Enable trace log in FollowerFailOverIT (elastic#38148)
  SnapshotShardsService Simplifications (elastic#38025)
  Default include_type_name to false in the yml test harness. (elastic#38058)
  Disable bwc preparing to backport of#37977, elastic#37857 and elastic#37872 (elastic#38126)

modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yml

@@ -2,7 +2,6 @@
 "Empty Bucket Aggregation":
   - do:
       indices.create:
-        include_type_name: false
         index: empty_bucket_idx
         body:
           settings:

modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yml

@@ -3,7 +3,6 @@ setup:
 
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yml

@@ -3,7 +3,6 @@ setup:
 
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml

@@ -23,7 +23,6 @@
 
     - do:
         indices.create:
-          include_type_name: false
           index: test_deprecated_htmlstrip
           body:
             settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/indices/validate_query/10_synonyms.yml

@@ -2,7 +2,6 @@
 "validate query with synonyms":
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml

@@ -5,7 +5,6 @@
   # versions in the same position.
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/20_ngram_search.yml

@@ -1,7 +1,6 @@
 "ngram search":
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:
@@ -44,7 +43,6 @@
 "testNGramCopyField":
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/30_ngram_highligthing.yml

@@ -1,7 +1,6 @@
 "ngram highlighting":
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/40_query_string.yml

@@ -2,7 +2,6 @@
 "Test query string with snowball":
   - do:
       indices.create:
-          include_type_name: false
           index:  test
           body:
             mappings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/50_queries_with_synonyms.yml

@@ -2,7 +2,6 @@
 "Test common terms query with stacked tokens":
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:
@@ -220,7 +219,6 @@
 "Test match query with synonyms - see #3881 for extensive description of the issue":
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/60_synonym_graph.yml

@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.suggest/20_phrase.yml

@@ -3,7 +3,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.suggest/30_synonyms.yml

@@ -2,7 +2,6 @@
 "suggestions with synonyms":
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/termvectors/10_payloads.yml

@@ -3,7 +3,6 @@
   # because there are no token filters that support payloads in core.
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           settings:

modules/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml

@@ -127,14 +127,12 @@
         body:  >
           {
             "mappings" : {
-              "test" : {
                 "properties" : {
                   "geoip.location" : {
                     "type": "geo_point"
                   }
                 }
               }
-            }
           }
   - match: { acknowledged: true }
 

modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/20_search.yml

@@ -2,7 +2,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: test123
         body:
           mappings:

modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yml

@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.put_template:
-        include_type_name: false
         name: index_template
         body:
           index_patterns: test-*

modules/lang-painless/src/test/resources/rest-api-spec/test/painless/20_scriptfield.yml

@@ -3,7 +3,6 @@
 setup:
     - do:
         indices.create:
-          include_type_name: false
           index: test
           body:
             mappings:

modules/lang-painless/src/test/resources/rest-api-spec/test/painless/50_script_doc_values.yml

@@ -1,7 +1,6 @@
 setup:
     - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 settings:

modules/lang-painless/src/test/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yml

@@ -4,7 +4,6 @@
         features: ["headers"]
     - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 mappings:

modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_execute_painless_scripts.yml

@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: my-index
         body:
           mappings:

modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml

@@ -6,7 +6,6 @@ setup:
         reason:  "moving_fn added in 6.4.0"
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
             mappings:

modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml

@@ -80,7 +80,6 @@ setup:
 "Random functions":
     - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 settings:
@@ -136,7 +135,6 @@ setup:
 "Decay geo functions":
     - do:
         indices.create:
-            include_type_name: false
             index: test
             body:
                 settings:

modules/lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml

@@ -5,7 +5,6 @@ setup:
 
   - do:
       indices.create:
-        include_type_name: false
         index:  test
         body:
           mappings:

modules/mapper-extras/src/test/resources/rest-api-spec/test/dense-vector/10_indexing.yml

@@ -5,7 +5,6 @@ setup:
 
   - do:
       indices.create:
-        include_type_name: false
         index: test-index
         body:
           settings:

modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml

@@ -5,7 +5,6 @@ setup:
 
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:

modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml

@@ -5,7 +5,6 @@ setup:
 
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:

modules/mapper-extras/src/test/resources/rest-api-spec/test/scaled_float/10_basic.yml

@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.create:
-          include_type_name: false
           index: test
           body:
             settings:

modules/mapper-extras/src/test/resources/rest-api-spec/test/sparse-vector/10_indexing.yml

@@ -5,7 +5,6 @@ setup:
 
   - do:
       indices.create:
-        include_type_name: false
         index: test-index
         body:
           settings:

modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml

@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
             mappings:

modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml

@@ -1,7 +1,6 @@
 setup:
   - do:
       indices.create:
-        include_type_name: false
         index: test
         body:
           mappings:

modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml

@@ -2,7 +2,6 @@
 "Test percolator basics via rest":
   - do:
       indices.create:
-        include_type_name: false
         index: queries_index
         body:
           mappings:

modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yml

@@ -166,9 +166,8 @@
         index: test
         body:
           mappings:
-            test:
-              _source:
-                enabled: false
+            _source:
+              enabled: false
   - do:
       index:
         index:  test
@@ -178,7 +177,7 @@
       indices.refresh: {}
 
   - do:
-      catch: /\[test\]\[test\]\[1\] didn't store _source/
+      catch: /\[test\]\[_doc\]\[1\] didn't store _source/
       reindex:
         body:
           source:

modules/reindex/src/test/resources/rest-api-spec/test/reindex/95_parent_join.yml

@@ -4,18 +4,16 @@ setup:
           index: source
           body:
             mappings:
-              doc:
-                properties:
-                  join_field: { "type": "join", "relations": { "parent": "child", "child": "grand_child" } }
+              properties:
+                join_field: { "type": "join", "relations": { "parent": "child", "child": "grand_child" } }
 
   - do:
       indices.create:
           index: dest
           body:
             mappings:
-              doc:
-                properties:
-                  join_field: { "type": "join", "relations": { "parent": "child", "child": "grand_child" } }
+              properties:
+                join_field: { "type": "join", "relations": { "parent": "child", "child": "grand_child" } }
 
   - do:
       index:

modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/30_new_fields.yml

@@ -5,10 +5,9 @@
         index: test
         body:
           mappings:
-            place:
-              properties:
-                name:
-                  type: keyword
+            properties:
+              name:
+                type: keyword
   - do:
       index:
         index:   test
@@ -18,7 +17,6 @@
 
   - do:
       indices.put_mapping:
-        include_type_name: false
         index: test
         body:
           properties:

plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/20_search.yml

@@ -4,7 +4,6 @@
 "Index ICU content":
     - do:
         indices.create:
-            include_type_name: false
             index:  test
             body:
                 settings:

plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_nori/20_search.yml

@@ -7,11 +7,10 @@
         index: test
         body:
           mappings:
-            type:
-              properties:
-                text:
-                  type:     text
-                  analyzer: kuromoji
+            properties:
+              text:
+                type:     text
+                analyzer: kuromoji
 
   - do:
       index:

plugins/analysis-nori/src/test/resources/rest-api-spec/test/analysis_nori/20_search.yml

@@ -7,11 +7,10 @@
         index: test
         body:
           mappings:
-            type:
-              properties:
-                text:
-                  type:     text
-                  analyzer: nori
+            properties:
+              text:
+                type:     text
+                analyzer: nori
 
   - do:
       index: