Merge branch 'calo-calib-run2-sim10' into 'Sim10/2018'

New Ecal and Hcal calibration for Run2 sim10

See merge request !122 (merged)

(cherry picked from commit dcb4e5bf)

6edae16c new Ecal calibration for Sim10 with G4 9.6.p02 and EmOpt2 830a3342 new Hcal calibration for Sim10 with G4 9.6.p02 and EmOpt2