Draft: Propagate !62428 to R24

!62428 (merged) wasn't swept to master automatically, because the tZq parton history is quite different in 21.2 vs 24.2. I apply the changes from that MR by hand.

@dellasta @alhroob @obut You may want to update the 24.2 tZq parton history to match what is done in 21.2, otherwise we will likely forget about it and end up getting different results between the current R21 analysis and any future iteration. Can one of you push the relevant changes?