Fix crash and cout as in PR #6647
Merge branch 'method2_for_PhaseII' of https://github.com/lihux25/cmssw into method2_for_PhaseII

Conflicts:
	RecoLocalCalo/HcalRecAlgos/src/PulseShapeFitOOTPileupCorrection.cc