update N-subjettiness defaults
update softdrop default
update softdrop default
fix softdrop jet algorithm
Merge pull request #6574 from richard-cms/HIphotonDQM

guard the nPho histograms from double counting, should fix HI issues
Merge pull request #6599 from mandrenguyen/electronLabelFix

updated PV label for electrons
Merge pull request #6655 from ahinzmann/FixSoftDrop

Fix soft drop jet producer
Merge pull request #6595 from mtosi/from-CMSSW_7_3_X_2014-11-25-0200_fixTrackClusterRemover

fix track cluster remover template definition
Merge remote branch 'origin/CMSSW_7_3_X' into CMSSW_7_0_X
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X