Cherry-picking JetSubStructureMomentTools moments to master

Jason Robert Veatchrequested to merge
jveatch/athena:master-Moments into master

This cherry-picks the changes from !32857 (merged) to master. Minor changes are included to resolve the merge conflicts.

Merge request reports