align to CMSSW_6_1_2_SLHC8_patch3