Merge topic 'fix_opengl_dependency' into pv-master

ad146c5 Fix OpenGL include dependency.
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: Idd8a776d513faaa32f84bdf1986af37603cc08f0