Merged l1t-devel-CMSSW_7_1_0_pre8 from repository cms-l1t-offline
Removed the last redundant variables from CaloParams.h
Merge branch 'l1t-devel-CMSSW_7_1_0_pre8' of github.com:cms-l1t-offline/cmssw into remove-vars