Propagate jet toolbox updates

See https://github.com/cms-jet/JetToolbox/pull/60

Also updated the TreeMaker fork used in our setup script to include that PR and the previous one