[Test] Revert temporary fixes for update mapping on recovery issue

This reverts:
"Test: Temporarily change delete/put_mapping to wait for green": commit e408f8f638c2dd97a3ec86c8a9ac940f43ab37a0.
"[TEST] wait for green to update mapping": commit b3641a2ee6eb23318d49f5f04b39149e70c2b65b.

rest-api-spec/test/indices.delete_mapping/10_basic.yaml

@@ -4,8 +4,6 @@
         indices.create:
           index: test_index
           body:
-              settings:
-                number_of_replicas: 0
               mappings:
                 test_type:
                   properties:
@@ -15,7 +13,7 @@
 
   - do:
         cluster.health:
-         wait_for_status: green
+         wait_for_status: yellow
 
   - do:
       indices.exists_type:
@@ -28,7 +26,7 @@
       indices.delete_mapping:
         index: test_index
         type: test_type
-
+  
   - do:
       indices.exists_type:
         index: test_index

rest-api-spec/test/indices.delete_mapping/all_path_options.yaml

@@ -5,24 +5,21 @@ setup:
         index: test_index1
         body:
             mappings: { test_type1: { }}
-            settings: { number_of_replicas: 0 }
 
   - do:
       indices.create:
         index: test_index2
         body:
             mappings: { test_type2: { }}
-            settings: { number_of_replicas: 0 }
   - do:
       indices.create:
         index: foo
         body:
             mappings: { test_type2: {  }}
-            settings: { number_of_replicas: 0 }
 
   - do:
         cluster.health:
-         wait_for_status: green
+         wait_for_status: yellow
 ---
 "delete with _all index":
   - do:

rest-api-spec/test/indices.put_mapping/10_basic.yaml

@@ -3,12 +3,6 @@
   - do:
       indices.create:
         index: test_index
-        body:
-            settings:
-                number_of_replicas: 0
-  - do:
-      cluster.health:
-            wait_for_status: green
 
   - do:
       indices.put_mapping:
@@ -27,7 +21,7 @@
   - do:
       indices.get_mapping:
         index: test_index
-
+  
   - match: {test_index.mappings.test_type.properties.text1.type:     string}
   - match: {test_index.mappings.test_type.properties.text1.analyzer: whitespace}
   - match: {test_index.mappings.test_type.properties.text2.type:     string}
@@ -61,7 +55,7 @@
   - do:
       indices.get_mapping:
         index: test_index
-
+  
   - match: {test_index.mappings.test_type.properties.text1.type:     string}
   - match: {test_index.mappings.test_type.properties.text1.fields.text_raw.index: not_analyzed}
   - match: {test_index.mappings.test_type.properties.text2.type:     string}

rest-api-spec/test/indices.put_mapping/all_path_options.yaml

@@ -2,24 +2,13 @@ setup:
   - do:
       indices.create:
         index: test_index1
-        body:
-            settings:
-                number_of_replicas: 0
   - do:
       indices.create:
         index: test_index2
-        body:
-            settings:
-                number_of_replicas: 0
   - do:
       indices.create:
         index: foo
-        body:
-            settings:
-                number_of_replicas: 0
-  - do:
-      cluster.health:
-            wait_for_status: green
+
 
 ---
 "put one mapping per index":

src/test/java/org/elasticsearch/index/mapper/geo/GeoMappingTests.java

@@ -45,7 +45,7 @@ public class GeoMappingTests extends ElasticsearchIntegrationTest {
                     .endObject()
                 .endObject()
                 .endObject()).execute().actionGet();
-        ensureGreen();
+        ensureYellow();
         assertPrecision(new Distance(2, DistanceUnit.MILLIMETERS));
 
         client().admin().indices().preparePutMapping("test").setType("type1").setSource(XContentFactory.jsonBuilder().startObject()