Merged 7_0_0_pre12-photon from repository cms-analysis-tools
Merged 7_0_0_pre12-photon from repository cms-analysis-tools
Fix inclusion of pfParticleSelection.
Remove old wood, related to pfIso.