Only set cluster if unset (#19683)

app/enterprise.go

@@ -122,7 +122,7 @@ func (s *Server) initEnterprise() {
 		s.Metrics = metricsInterface(s)
 	}
 
-	if clusterInterface != nil {
+	if clusterInterface != nil && s.Cluster == nil {
 		s.Cluster = clusterInterface(s)
 	}
 	if elasticsearchInterface != nil {

app/web_hub_test.go

@@ -338,7 +338,6 @@ func TestHubConnIndexInactive(t *testing.T) {
 }
 
 func TestReliableWebSocketSend(t *testing.T) {
-	t.Skip("MM-42033")
 	testCluster := &testlib.FakeClusterInterface{}
 
 	th := SetupWithClusterMock(t, testCluster)