patches to fix dupicates track problem in upgrade geometry
Merged CMSSW_6_2_X_SLHC from repository cms-sw
Fix conflicts.
Merge pull request #3051 from cerati/fix-duplicates-slhc-tracking

patches to fix duplicates track problem in upgrade geometry