Answer the verbs release 6 removed by name, and drop the merge window and push settings from the manifest (release 6, issue 1945 B10)

module.json

@@ -25,23 +25,6 @@
   },
   "secrets-owner": "mesh-controller",
   "prepares": true,
-  "settings": {
-    "merge-window": {
-      "kind": "preference",
-      "default": "90s",
-      "why": "merges are collected while they keep coming, and a batch is planned once no merge came for this long (novox/hq ADR 0276)"
-    },
-    "merge-window-at-most": {
-      "kind": "preference",
-      "default": "10m",
-      "why": "a busy period never holds a batch longer than this after its first merge (novox/hq ADR 0276)"
-    },
-    "push-wait": {
-      "kind": "preference",
-      "default": "2m",
-      "why": "how long a push to a named machine waits for that machine's answer, so its call says how it went; a call's own wait overrides it, and 0 waits for nothing (novox/hq issue 629)"
-    }
-  },
   "tools": [
     "tools",
     "calls",
@@ -124,23 +107,6 @@
       "place": "mesh",
       "owner": "mesh-controller"
     },
-    {
-      "id": "merge-window",
-      "type": "file",
-      "path": "${dir:mesh-state}/merge-window.json",
-      "mode": "0600",
-      "owner": "mesh-controller",
-      "content": "{\n  \"merge-window\": \"${setting:merge-window}\",\n  \"merge-window-at-most\": \"${setting:merge-window-at-most}\"\n}\n"
-    },
-    {
-      "id": "push",
-      "trusted": false,
-      "type": "file",
-      "path": "${dir:mesh-state}/push.json",
-      "mode": "0600",
-      "owner": "mesh-controller",
-      "content": "{\n  \"push-wait\": \"${setting:push-wait}\"\n}\n"
-    },
     {
       "id": "controller",
       "type": "process",
@@ -164,9 +130,7 @@
         "MESH_BROKER_MANAGEMENT_PORT": "${seat:mesh-broker:15672}",
         "MESH_BROKER_ADDRESS_PORT": "${seat:mesh-broker:5671}",
         "MESH_BUS_NATS_FILE": "${dir:mesh-state}/bus",
-        "MESH_CONTROLLER_VERSION": "${version}",
-        "MESH_MERGE_WINDOW_FILE": "${dir:mesh-state}/merge-window.json",
-        "MESH_PUSH_FILE": "${dir:mesh-state}/push.json"
+        "MESH_CONTROLLER_VERSION": "${version}"
       },
       "replaces": [
         "server"