Merge cms-sw CMSSW_6_2_X_SLHC into my CMSSW_6_2_X_SLHC