6_2_X_SLHC12 Fixes for GEM geometry

Move PR #3998 to branch CMSSW_6_2_X_SLHC .