Fixing JetSubStructureMomentTools differences w.r.t. master
Several minor changes have caused 21.2 and master to diverge, making sweeps fail. This attempts to fix several of the issues in 21.2 to be consistent with master. Hopefully this will prevent future failed sweeps.