Correct rotation and labelling
Label fix
Merge branch 'Phase2-geom04' of github.com:bsunanda/cmssw into gem-sim-validation

Conflicts:
	Geometry/MuonCommonData/data/v6/gem11.xml
	Geometry/MuonCommonData/data/v7/gem11.xml