Magnet up version of reverting the usage of electron shower parameters

Sajan Easorequested to merge
upgrade/master into upgrade/magup

Magnet up version of the update which reverts the usage of electron shower parameters in Calo

Merge request reports