Gem geometry customs update

To be included after https://github.com/cms-sw/cmssw/pull/3776