Merged l1t-devel-CMSSW_7_3_0_pre1 from repository cms-l1t-offline
Update stage-2 e/g trimming. Add missing stage-1 parameters in caloParams_cfi.py