resolved merge conflicts (#88415)

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,6 +11,7 @@ Delete any items that are not applicable to this PR.
 - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
 - [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist)
 - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)
+- [ ] If a plugin configuration key changed, check if it needs to be whitelisted in the [cloud](https://github.com/elastic/cloud) and added to the [docker list](https://github.com/elastic/kibana/blob/c29adfef29e921cc447d2a5ed06ac2047ceab552/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker)
 - [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
 
 ### For maintainers

src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker

@@ -138,7 +138,17 @@ kibana_vars=(
     tilemap.url
     timelion.enabled
     vega.enableExternalUrls
+    xpack.actions.allowedHosts
+    xpack.actions.enabled
+    xpack.actions.enabledActionTypes
+    xpack.actions.preconfigured
     xpack.actions.proxyUrl
+    xpack.actions.proxyHeaders
+    xpack.actions.proxyRejectUnauthorizedCertificates
+    xpack.actions.rejectUnauthorized
+    xpack.alerts.healthCheck.interval
+    xpack.alerts.invalidateApiKeysTask.interval
+    xpack.alerts.invalidateApiKeysTask.removalDelay
     xpack.apm.enabled
     xpack.apm.serviceMapEnabled
     xpack.apm.ui.enabled
@@ -166,6 +176,9 @@ kibana_vars=(
     xpack.code.security.gitProtocolWhitelist
     xpack.encryptedSavedObjects.encryptionKey
     xpack.encryptedSavedObjects.keyRotation.decryptionOnlyKeys
+    xpack.event_log.enabled
+    xpack.event_log.logEntries
+    xpack.event_log.indexEntries
     xpack.fleet.agents.elasticsearch.host
     xpack.fleet.agents.kibana.host
     xpack.fleet.agents.tlsCheckDisabled
@@ -260,6 +273,18 @@ kibana_vars=(
     xpack.security.public.port
     xpack.spaces.enabled
     xpack.spaces.maxSpaces
+    xpack.task_manager.enabled
+    xpack.task_manager.max_attempts
+    xpack.task_manager.poll_interval
+    xpack.task_manager.max_poll_inactivity_cycles
+    xpack.task_manager.request_capacity
+    xpack.task_manager.index
+    xpack.task_manager.max_workers
+    xpack.task_manager.monitored_stats_required_freshness
+    xpack.task_manager.monitored_aggregated_stats_refresh_rate
+    xpack.task_manager.monitored_stats_running_average_window
+    xpack.task_manager.monitored_task_execution_thresholds
+    xpack.task_manager.version_conflict_threshold
     telemetry.allowChangingOptInStatus
     telemetry.enabled
     telemetry.optIn