Fix build errors caused by carryovers

[wmtan]

This pull request fixes the build errors caused by a carry-forward from 7_4_X.
Please merge in time for the next IB, if convenient.

[cmsbuild]

A new Pull Request was created by @wmtan for CMSSW_7_4_ROOT6_X.

Fix build errors caused by carryovers

It involves the following packages:

DataFormats/Candidate
DataFormats/EgammaCandidates
DataFormats/L1Trigger
DataFormats/MuonReco
DataFormats/ParticleFlowCandidate
DataFormats/PatCandidates
DataFormats/RecoCandidate
DataFormats/TauReco

@nclopezo, @monttj, @cmsbuild, @StoyanStoynev, @slava77, @vadler, @mulhearn can you please review it and eventually sign? Thanks.
@Sam-Harper, @battibass, @jpavel, @abbiendi, @lgray, @trocino, @amagitte, @bachtis this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
If you are a L2 or a release manager you can ask for tests by saying 'please test' in the first line of a comment.