Merged l1t-devel-CMSSW_7_1_4_patch1 from repository cms-l1t-offline
Merge branch 'l1t-devel-CMSSW_7_1_4_patch1' of github.com:cms-l1t-offline/cmssw into from-CMSSW_7_1_4_patch1
Add L1Extra from Emulation