diff --git a/output/schema/validation-errors.json b/output/schema/validation-errors.json
index defb76767e..eba22ddd5c 100644
--- a/output/schema/validation-errors.json
+++ b/output/schema/validation-errors.json
@@ -18,75 +18,6 @@
       ],
       "response": []
     },
-    "ilm.delete_lifecycle": {
-      "request": [
-        "Request: query parameter 'master_timeout' does not exist in the json spec",
-        "Request: query parameter 'timeout' does not exist in the json spec"
-      ],
-      "response": []
-    },
-    "ilm.explain_lifecycle": {
-      "request": [
-        "Request: query parameter 'master_timeout' does not exist in the json spec"
-      ],
-      "response": []
-    },
-    "ilm.get_lifecycle": {
-      "request": [
-        "Request: query parameter 'master_timeout' does not exist in the json spec",
-        "Request: query parameter 'timeout' does not exist in the json spec"
-      ],
-      "response": []
-    },
-    "ilm.put_lifecycle": {
-      "request": [
-        "Request: query parameter 'master_timeout' does not exist in the json spec",
-        "Request: query parameter 'timeout' does not exist in the json spec"
-      ],
-      "response": []
-    },
-    "ilm.start": {
-      "request": [
-        "Request: query parameter 'master_timeout' does not exist in the json spec",
-        "Request: query parameter 'timeout' does not exist in the json spec"
-      ],
-      "response": []
-    },
-    "ilm.stop": {
-      "request": [
-        "Request: query parameter 'master_timeout' does not exist in the json spec",
-        "Request: query parameter 'timeout' does not exist in the json spec"
-      ],
-      "response": []
-    },
-    "ingest.delete_geoip_database": {
-      "request": [
-        "Request: query parameter 'master_timeout' does not exist in the json spec",
-        "Request: query parameter 'timeout' does not exist in the json spec"
-      ],
-      "response": []
-    },
-    "ingest.delete_ip_location_database": {
-      "request": [
-        "Request: query parameter 'master_timeout' does not exist in the json spec",
-        "Request: query parameter 'timeout' does not exist in the json spec"
-      ],
-      "response": []
-    },
-    "ingest.put_geoip_database": {
-      "request": [
-        "Request: query parameter 'master_timeout' does not exist in the json spec",
-        "Request: query parameter 'timeout' does not exist in the json spec"
-      ],
-      "response": []
-    },
-    "ingest.put_ip_location_database": {
-      "request": [
-        "Request: query parameter 'master_timeout' does not exist in the json spec",
-        "Request: query parameter 'timeout' does not exist in the json spec"
-      ],
-      "response": []
-    },
     "ml.stop_datafeed": {
       "request": [
         "Request: missing json spec query parameter 'allow_no_datafeeds'"
diff --git a/specification/_json_spec/ilm.delete_lifecycle.json b/specification/_json_spec/ilm.delete_lifecycle.json
index d3e83b77b3..32f55522b0 100644
--- a/specification/_json_spec/ilm.delete_lifecycle.json
+++ b/specification/_json_spec/ilm.delete_lifecycle.json
@@ -23,6 +23,15 @@
         }
       ]
     },
-    "params": {}
+    "params": {
+      "master_timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout for connection to master node"
+      },
+      "timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout"
+      }
+    }
   }
 }
diff --git a/specification/_json_spec/ilm.explain_lifecycle.json b/specification/_json_spec/ilm.explain_lifecycle.json
index 993c9fc0c8..76a815e79b 100644
--- a/specification/_json_spec/ilm.explain_lifecycle.json
+++ b/specification/_json_spec/ilm.explain_lifecycle.json
@@ -31,6 +31,10 @@
       "only_errors": {
         "type": "boolean",
         "description": "filters the indices included in the response to ones in an ILM error state, implies only_managed"
+      },
+      "master_timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout for connection to master node"
       }
     }
   }
diff --git a/specification/_json_spec/ilm.get_lifecycle.json b/specification/_json_spec/ilm.get_lifecycle.json
index 1e5037edb9..44c3ea878c 100644
--- a/specification/_json_spec/ilm.get_lifecycle.json
+++ b/specification/_json_spec/ilm.get_lifecycle.json
@@ -27,6 +27,15 @@
         }
       ]
     },
-    "params": {}
+    "params": {
+      "master_timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout for connection to master node"
+      },
+      "timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout"
+      }
+    }
   }
 }
diff --git a/specification/_json_spec/ilm.put_lifecycle.json b/specification/_json_spec/ilm.put_lifecycle.json
index 2ae9227811..381956a35c 100644
--- a/specification/_json_spec/ilm.put_lifecycle.json
+++ b/specification/_json_spec/ilm.put_lifecycle.json
@@ -24,7 +24,16 @@
         }
       ]
     },
-    "params": {},
+    "params": {
+      "master_timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout for connection to master node"
+      },
+      "timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout"
+      }
+    },
     "body": {
       "description": "The lifecycle policy definition to register"
     }
diff --git a/specification/_json_spec/ilm.start.json b/specification/_json_spec/ilm.start.json
index 722ad25ee2..893c8c98ba 100644
--- a/specification/_json_spec/ilm.start.json
+++ b/specification/_json_spec/ilm.start.json
@@ -17,6 +17,15 @@
         }
       ]
     },
-    "params": {}
+    "params": {
+      "master_timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout for connection to master node"
+      },
+      "timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout"
+      }
+    }
   }
 }
diff --git a/specification/_json_spec/ilm.stop.json b/specification/_json_spec/ilm.stop.json
index 7a9643962a..b60cd2223d 100644
--- a/specification/_json_spec/ilm.stop.json
+++ b/specification/_json_spec/ilm.stop.json
@@ -17,6 +17,15 @@
         }
       ]
     },
-    "params": {}
+    "params": {
+      "master_timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout for connection to master node"
+      },
+      "timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout"
+      }
+    }
   }
 }
diff --git a/specification/_json_spec/ingest.delete_geoip_database.json b/specification/_json_spec/ingest.delete_geoip_database.json
index ce4d2b7173..d56019cf4f 100644
--- a/specification/_json_spec/ingest.delete_geoip_database.json
+++ b/specification/_json_spec/ingest.delete_geoip_database.json
@@ -23,6 +23,15 @@
         }
       ]
     },
-    "params": {}
+    "params": {
+      "master_timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout for connection to master node"
+      },
+      "timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout"
+      }
+    }
   }
 }
diff --git a/specification/_json_spec/ingest.delete_ip_location_database.json b/specification/_json_spec/ingest.delete_ip_location_database.json
index 629ea86961..427cbe9817 100644
--- a/specification/_json_spec/ingest.delete_ip_location_database.json
+++ b/specification/_json_spec/ingest.delete_ip_location_database.json
@@ -23,6 +23,15 @@
         }
       ]
     },
-    "params": {}
+    "params": {
+      "master_timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout for connection to master node"
+      },
+      "timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout"
+      }
+    }
   }
 }
diff --git a/specification/_json_spec/ingest.put_geoip_database.json b/specification/_json_spec/ingest.put_geoip_database.json
index f27c28fd73..c732652c34 100644
--- a/specification/_json_spec/ingest.put_geoip_database.json
+++ b/specification/_json_spec/ingest.put_geoip_database.json
@@ -24,7 +24,16 @@
         }
       ]
     },
-    "params": {},
+    "params": {
+      "master_timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout for connection to master node"
+      },
+      "timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout"
+      }
+    },
     "body": {
       "description": "The database configuration definition",
       "required": true
diff --git a/specification/_json_spec/ingest.put_ip_location_database.json b/specification/_json_spec/ingest.put_ip_location_database.json
index b10e290bd4..87a2adab72 100644
--- a/specification/_json_spec/ingest.put_ip_location_database.json
+++ b/specification/_json_spec/ingest.put_ip_location_database.json
@@ -24,7 +24,16 @@
         }
       ]
     },
-    "params": {},
+    "params": {
+      "master_timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout for connection to master node"
+      },
+      "timeout": {
+        "type": "time",
+        "description": "Explicit operation timeout"
+      }
+    },
     "body": {
       "description": "The database configuration definition",
       "required": true