[CMSSW_4_1_X] Align CMSSW_4_1_X to CMSSW_4_1_8_patch13 CVS

Align to CMSSW_4_1_8_patch13