Backport fixes to make tvtk, mayavi modules work with new and old pipelines