Update GEM geometry
Restore files in v2 (though incorrect)
Merge pull request #6708 from bsunanda/Phase2-gem06

Phase2-gem06