fixed chi2 constraint on pedestal and time
Merge pull request #6855 from violatingcp/hcal-fixchi2

fixed chi2 constraint on pedestal and time
Merge branch 'CMSSW_7_4_X' of https://github.com/cms-sw/cmssw into CMSSW_7_4_X

Conflicts:
	RecoLocalCalo/HcalRecAlgos/src/PulseShapeFitOOTPileupCorrection.cc
Changed the alphaT filter to allow the alphaT calculation to be carried out with the delta HT kept as zero. Added a new option setDPhiZero, that is defaulted to reproduce old behaviour
Merge pull request #6875 from aelwood/alphaT-HLTFilter-74X

Update to the AlphaT HLT Filter 74X