Remove JER smearing from energy fractions and MHT fix

Merged Kevin Pedro requested to merge github/fork/kpedro88/Run2_2017_V17 into Run2_2017_V17

Merge request reports