Correct shielding structure near ME11 region
Merged refs/pull/3776/head from repository cms-sw

Conflicts:
	Geometry/MuonCommonData/data/PhaseII/v3/mf.xml
Merge pull request #3907 from andersonjacob/MergeFixedGem02

fixed a merging error from some clean up that happened since the original changes from Sunanda