Reverted to using the legacy CPE error
Merge remote-tracking branch 'official-cmssw/CMSSW_7_2_X' into revertNewCPE

Conflicts:
	RecoLocalTracker/SiStripRecHitConverter/python/StripCPEfromTrackAngle_cfi.py
Merge pull request #5581 from nickmccoll/revertNewCPE

Revert new cpe