BUG #15090: Fixed state loading + time issue.

The problem was that that vtkSMStateLoader was missing the timekeeper
proxy already present when loading state due to name mismatch. Fixed
that. Also cleaned up vtkSMStateLoader to use new/easier method on
vtkSMParaViewPipelineController to locate exisiting proxies of a
particular type.

Change-Id: I80e5f0778170118d2c43b4f63e8595190fbf037e
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I6fc7f770c7b522a32f20bf4386b02a40340f136e
Merge topic '15090_fix_state_loading_issues' into next

f815af75 BUG #15090: Fixed state loading + time issue.
Merge topic '15078_fix_point_sprite' into next

4979c43a BUG #15078: Fix update issue with PointSprite plugin.
Merge topic 'text_updates' into next

5122824a Bring in volume rendering fixes.
f371c3e1 Bump VTK to bring in text rendering changes.
cmake: replace PYTHON_INCLUDE_PATH with PYTHON_INCLUDE_DIRS

VTK's FindPythonLibs.cmake removed this (deprecated) variable.

Change-Id: Ie945e26110dcac46c773916ac8573d0fb0cfd634
Merge topic 'update-vtk-20141030' into next

535c1903 cmake: replace PYTHON_INCLUDE_PATH with PYTHON_INCLUDE_DIRS
58dedb20 update vtk
Merge topic 'include-mpi-paths-as-system' into next

eb03ba12 mpi: include MPI paths as SYSTEM includes
70f0c1f5 whitespace: add missing newlines at the end of files
QtPython: don't quote variables which may be a list

PYTHON_INCLUDE_DIRS may include more than one value which, if quoted,
gives a single include path with a ';' in it.

Change-Id: Ifa4217d92352307dc6a4da23e4b7f1ff4f58fcc6
QtPython: find PythonLibs

Change-Id: I4d0b0a9fd8bc9af5144b7f60f34c4fbf63538c70
Merge topic 'update-vtk-20141030' into next

b2208efe QtPython: find PythonLibs
52b629cf QtPython: don't quote variables which may be a list
BUG #15093: Fixed issue with stereo rendering.

The problem was that the StereoType set on vtkRenderWindow was
incorrect. It ended up picking Crystal Eyes incorrectly. The problem was
due to the the "StereoType" property being reset to default by
vtkSMParaViewPipelineController. This fixes that.

Also added tests to test setting of stereo modes to catch this in
future.

Change-Id: I20d7227d2059be007b8ff2d1a6abffa349679345
Merge topic '15093_fix_stereo_issues' into next

0c9dfba0 BUG #15093: Fixed issue with stereo rendering.
BUG #15032: Fixed usability issues with settings dialog.

+ Removing duplicate labels reported in the bug.
+ Also added ability to show labels next to the text for a widget in the
Settings dialog which makes it easier to refer to the settings rather
than having to resort to using long text  like "Set the compression
method used blah blah...".

Change-Id: I420c3988f8c453958eb5720fd3b9a7a0ec6a6188
Merge topic '15032_fix_settings_dialog' into next

c49e9c1b BUG #15032: Fixed usability issues with settings dialog.
Rendering-Base: add vtkTriangleFilter

Change-Id: If1fac779a37fbf6864900df2cc88007b8fe868e0
Merge topic 'update-rendering-edition' into next

38622b58 Rendering-Base: add vtkTriangleFilter