Back-port Hcal method2 to 620SLHC
Remove two "backup" files...
Set pointers to null in case the destructor tries to delete them
Merge pull request #1 from mark-grimes/fixMemoryErrorIn6811

Set pointers to null in case the destructor tries to delete them
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
Merge pull request #6811 from lihux25/method2_for_PhaseII

Method2 for phase II