Fix error in module names; add missing L1Extra collections
Merge branch 'CMSSW_7_3_X' of https://github.com/apana/cmssw into mydevel-branch
Merge pull request #6650 from apana/CMSSW_7_3_X

Fix error in stage1 emulator module names,  add missing L1Extra collections (74x)