SERVER-136192ClosedFixed
Apply SERVER-133362 into master
SERVER-133362 was only applied to 9.0. Apply it to master now that we know SERVER-135741 cannot be fixed only with sampling
SERVER-133362 was only applied to 9.0. Apply it to master now that we know SERVER-135741 cannot be fixed only with sampling