Option to use old CPE error if charge exceeds one MIP
Merge pull request #6831 from wmtford/QdxCPE

Option to use old CPE error if charge exceeds one MIP
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X