[ros-diffs] [jgardou] 63609: [OPENGL32/MESA] - Some more cleanup from previous commits CORE-7499