corrections to upgrade->calo conversion for EtSums
Merge branch 'l1t-devel-CMSSW_7_3_0_pre1' of github.com:cms-l1t-offline/cmssw into devel

* 'l1t-devel-CMSSW_7_3_0_pre1' of github.com:cms-l1t-offline/cmssw:
  Bugfixes in extended RCT scale factor implementation.