ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.47 -j1.48 vtkGenerateVTKConfig.cmake)