Synchronize with CMSSW_6_2_0_SLHC4