Fix two parameters in two Egamma filters in di-photon paths for HIG
Removed sortByDepth since it was not being used
Merge pull request #4923 from perrotta/fixParametersForCmsHlt81

Fix two parameters in two Egamma filters in di-photon paths for HIG
Merge pull request #4925 from nclopezo/fix-warning-RecoParticleFlow-PFClusterProducer

Fix warning in RecoParticleFlow/PFClusterProducer: Removed sortByDepth since it was not being used
Merge remote-tracking branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X