Fix assignment of necessary information for pfmva
get rid of dead code
do not allow ROs that both have GSF tracks and clusters to merge.
fix the assignment of early/late brem.
fix local locking of ECAL clusters.
Merge pull request #1644 from lgray/fixes_for_pre10

Reco fixes -- Cleanup of Old MVA assignment / kill dead code / bugfixes
Merge remote-tracking branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X