Overlap removed and attribute order changed
Merge branch 'CMSSW_7_1_X' of https://github.com/cms-sw/cmssw into from-CMSSW_7_1_X_2014-03-13-0200
Merge pull request #2838 from GiacomoSguazzoni/from-CMSSW_7_1_X_2014-03-13-0200

Geometry --  Fixes to tracker Geometry.