In doing the backport for SERVER-86505 to 7.3, I realized that the changes made were insufficient to resolve the problem. BF-31679 also continues to accumulate BFGs on all affected branches. I completed the backport anyway so that all of the branches would be in sync, but we should figure out what additional changes are necessary to resolve the BF. Probably there is some other place in the test that can throw this error that is not covered by the changes made in SERVER-86505.