Merged l1t-devel from repository cms-l1t-offline
testing carrying forward proceedure
Merge branch 'l1t-devel-CMSSW_7_0_0_pre8' of github.com:cms-l1t-offline/cmssw into mydevel-branch
add calo params