Merge remote-tracking branch 'elastic/master' into use-bundled-java-integ-tests

* elastic/master:
  Mute failing IndexShard local history test
  Fix Failing to Handle Ex. in TransportShardBulkAction (elastic#40923)

Author: jasontedor

server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java

@@ -194,7 +194,7 @@ private void finishRequest() {
                         null, context.getPrimary(), logger));
             }
 
-        }.doRun();
+        }.run();
     }
 
     /**

server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java

@@ -1090,6 +1090,7 @@ public void testGlobalCheckpointSync() throws IOException {
         closeShards(replicaShard, primaryShard);
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/40929")
     public void testRestoreLocalHistoryFromTranslogOnPromotion() throws IOException, InterruptedException {
         final IndexShard indexShard = newStartedShard(false);
         final int operations = 1024 - scaledRandomIntBetween(0, 1024);