Merge branch 'FindOpenGL-libglvnd-subdir' into release-3.14

Merge-request: !3236