Merged l1t-devel-CMSSW_7_2_0_pre8 from repository cms-l1t-offline
Stage-2 clustering: remove temporary trimming. Add missing stage-2 parameters in caloParams_cfi.py.