Forwardport4325

This is forward port by hand of PR 4325, which cannot be merged due to random number thread safity modifications in 7_1_X.

This PR fix pre-mixing for Hcal.