Bug 1021: Enhance OVR GlueGen Mapping / Adapt to GlueGen commit 9ee44e1a289ecbac024662dd5a2ffc42e8add023 (Bug 1025)