Merge branch 'add_egmfilters_new' of github.com:dbenedet/cmssw into add_egmfilters_new