WIP, changes to support paraview 4.2 branch