Sweeping PS changes to master
This sweeps !32610 (merged) and !32674 (merged) to master. The changes to the Jet/MET derivation package (to the default list of variables) can't be swept because the version of those packages seems to be super outdated. I'm not touching them, leaving the changes to come over when the rest is swept.