ClusterService: improve update thread shutdown logic.

src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java

@@ -166,12 +166,7 @@ public class InternalClusterService extends AbstractLifecycleComponent<ClusterSe
             onGoingTimeout.cancel();
             onGoingTimeout.listener.onClose();
         }
-        updateTasksExecutor.shutdown();
+        ThreadPool.terminate(updateTasksExecutor, 10, TimeUnit.SECONDS);
-        try {
-            updateTasksExecutor.awaitTermination(10, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            // ignore
-        }
         remove(localNodeMasterListeners);
     }