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