responset to pr comments

Author: jdconrad

server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java

@@ -734,11 +734,6 @@ public ClusterState execute(BatchExecutionContext<StartedShardUpdateTask> batchE
                                 indexMetadata.getNumberOfShards(),
                                 startedShardEntry.timestampRange
                             );
-                            /*
-                             * Only track 'event.ingested' range this if the cluster state min transport version is on/after the version
-                             * where we added 'event.ingested'. If we don't do that, we will have different cluster states on different
-                             * nodes because we can't send this data over the wire to older nodes.
-                             */
                             IndexLongFieldRange newEventIngestedMillisRange = currentEventIngestedMillisRange.extendWithShardRange(
                                 startedShardEntry.shardId.id(),
                                 indexMetadata.getNumberOfShards(),

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authc/AuthenticationTests.java

@@ -29,6 +29,7 @@
 import org.elasticsearch.xpack.core.security.authc.service.ServiceAccountSettings;
 import org.elasticsearch.xpack.core.security.authc.support.AuthenticationContextSerializer;
 import org.elasticsearch.xpack.core.security.authz.RoleDescriptorsIntersection;
+import org.elasticsearch.xpack.core.security.authz.permission.RemoteClusterPermissions;
 import org.elasticsearch.xpack.core.security.user.AnonymousUser;
 import org.elasticsearch.xpack.core.security.user.User;
 import org.hamcrest.Matchers;
@@ -1104,7 +1105,7 @@ public void testMaybeRewriteMetadataForApiKeyRoleDescriptorsWithRemoteClusterRem
             .build();
 
         // pick a version that will only remove one of the two privileges
-        final TransportVersion olderVersion = TransportVersion.fromId(8772001);
+        final TransportVersion olderVersion = RemoteClusterPermissions.MANAGE_ROLES_PRIVILEGE;
 
         Map<String, Object> rewrittenMetadata = with2privs.maybeRewriteForOlderVersion(olderVersion).getEffectiveSubject().getMetadata();
         assertThat(rewrittenMetadata.keySet(), equalTo(with2privs.getAuthenticatingSubject().getMetadata().keySet()));