fix for RECO V4 geometry options
Merged HGC_RecoGeometry_Fix from repository lgray
Fix some of the geometry issues
Merged refs/pull/4553/head from repository cms-sw