Merge cms-sw CMSSW_6_2_X_SLHC into my tracker_developments-slhc20