Fix ComponentTemplatesFileSettingsIT.testSettingsApplied (#137669)

This is pretty much a copy of #130869.

Since the cluster state API no longer runs on the master node, we need to wait for the cluster state publication to have finished before retrieving the cluster state.

Fixes #137258

(cherry picked from commit bc5bc54)

# Conflicts:
#	muted-tests.yml

Author: nielsbauman

server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java

@@ -386,6 +386,7 @@ private void assertClusterStateSaveOK(CountDownLatch savedClusterState, AtomicLo
         boolean awaitSuccessful = savedClusterState.await(20, TimeUnit.SECONDS);
         assertTrue(awaitSuccessful);
 
+        awaitMasterNode();
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
             new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())
         ).actionGet();
@@ -532,8 +533,7 @@ public void testSettingsApplied() throws Exception {
         writeJSONFile(dataNode, testJSON);
 
         logger.info("--> start master node");
-        final String masterNode = internalCluster().startMasterOnlyNode();
-        awaitMasterNode(internalCluster().getNonMasterNodeName(), masterNode);
+        internalCluster().startMasterOnlyNode();
 
         assertClusterStateSaveOK(savedClusterState.v1(), savedClusterState.v2());