JetSubStructureMomentTools: fixing merge conflicts for MR 21290
This is a manual cherry-pick of !21290 (merged) that resolves the merge conflicts in master.
This is a manual cherry-pick of !21290 (merged) that resolves the merge conflicts in master.