Merge pull request #20 from cms-sw/CMSSW_6_2_X_SLHC

Merge cms-sw CMSSW_6_2_X_SLHC into my CMSSW_6_2_X_SLHC
Define a new CmsTracker...Builder for the phase 2 outer tracker disks
Added a new CmsTracker...Builder for the outer tracker rings
Phase2 OT EC layers and rings added to the TkDetLayer package. A version of them is a clone of FPIX. The Ringed version is copied from TID layer and rings
Only two rings considered in the phase 2 OT EC navigation. Correct definition of front and back rings
Phase 2 OT EC search for compatible det done looking for three rings
Second module in pt module added to Phase 2 OT EC navigation
Removed first version of Phase 2 OT EC classes
clean up of the phase OT EC code from Pixel forward disk classes
Log message downgraded to LogDebug
CmsTrackerDiskBuilder split into present and Phase1 based on number of blades

Conflicts:
	Geometry/TrackerNumberingBuilder/plugins/CmsTrackerDiskBuilder.cc
	Geometry/TrackerNumberingBuilder/plugins/CmsTrackerDiskBuilder.h
Restore FPIX detid fix after the splitting of FPIX and phase 2 OT ECs
New TkDetLayer classes for the phase2 outer tracker barrel layer and rod
Removed phase 2 code from PixelBarrelLayer
Merge pull request #4108 from venturia/navigation_cleanup-SLHC13

Tracker reco geometry and navigation split between inner pixel and phase 2 outer tracker