Bring in VTK fixes for OpenGL includes.

Change-Id: If97e2ab545433f1249c52c5f821ba0f3e2e1b736
Fix build issues with GCC 4.1.

Internal class needs to public for STL.

Change-Id: I23ed675a72324121dfdc62ba5048af8057b86f83
Merge topic 'bgp_xlc_fixes' into next

0cada69 Fix build issues with GCC 4.1.
05c0ba7 Bring in VTK fixes for OpenGL includes.