COMP: Fix compile issue using version header available in both VTK 5 and 6
Merge branch 'add-vtkv6-itkv4-support'

* add-vtkv6-itkv4-support:
  COMP: Fix compile issue using version header available in both VTK 5 and 6