Merge cms-sw CMSSW_6_2_X into my CMSSW_6_2_X