Merge topic '14845_reset_color_map'

4e8d7f84 Fix condition to catch exception case.
79655119 BUG 14845: Added ability to reset color map.
Merge topic '15053_fix_coloring_with_missing_arrays'

e0bf4863 BUG #14921: Fixed scalar bar visibility from context menu.
b0094786 BUG #0011858. Fix unnecessary showing of scalar bar.
dbafed2a HACK: Fix duplicate entries in Color By.
49f33566 BUG #15053. Fixed issues when coloring with a no longer valid array.
Merge topic '15085_fix_install_rules_for_catalyst'

c39975a3 BUG #15085: Fix install rules for vtkPVPythonCatalystPython.
Merge topic '15107_catalyst_rendering_edition'

cb1c2982 Fixing Catalyst rendering edition for changes to VTK/Rendering.
Merge topic 'opengl2-backend'

dfcfbaf8 We have an OpenGL2 vtkCompositeMapper2 now
2d67dfad Fix OpenGL legacy backend
44b1d8e9 Restore volume rendering - now in VTK master
caee75a6 Get ParaView working with the OpenGL2 backend
69a9c54f First pass at getting ParaView to compile with OpenGL2
Merge topic 'vtk_master_20141105'

3155f740 Update VTK.
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I285b5b10b4bfaa18d1845b31353df03a545f2548