Merge branch 'release/v2.11.7' into develop
Remove more osg stuff.
Bump version.
Merge branch 'release/v2.11.8'