forward port HCAL fix of pre-mixing
Merge pull request #4387 from civanch/forwardport_4325_4379

Forward port HCAL fix of pre-mixing.
Merge remote branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X