Merge branch 'CMSSW_6_2_0_SLHC12/tkMuSW-addCand-5par-gemphi' of https://github.com/slava77/cmssw into UpdatesFromSlava
Merged TTI_62X_TrackTriggerObjects from repository EmanuelPerez