Merge topic '0013870-fix-jpeg-mem-src-conflict' into pv-master

3e7d56d Merge topic '0013870-fix-jpeg-mem-src-conflict' into master
54d172b Merge topic 'RestoreTclExamples' into master
d0ef940 BUG: Restore tcl test removed by TestingWithoutData_Tcl
099964d Merge topic 'java-deprecation-warning' into master
1d79220 Fix to use newer libjpeg API.
c4f3c08 Merge topic 'restore-broken-dep' into master
af82dc6 Restore vtkWrappingPython for matplotlib.
5e097f8 Merge topic 'matplotlib-find-python' into master
e4b56ef Update the matplotlib cmakelists to find python itself.
8e8d1fc Merge topic 'TestSurfaceLIC-baseline' into master
cf02b2c Set the correct baseline directory for TestSurfaceLIC.
dde5057 Merge topic 'PythonError_TestInteractorEventRecorder' into master
3060f8d COMP: define a portable ExitEvent
75a5e32 Merge topic 'Tolerance_TestParametricFunctions' into master
e6f9434 COMP: Increase tolerance for TestParametricFunctions
13f8dbc Merge topic 'TestingWithoutData_Tcl' into master
...
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

Change-Id: Icca0810dfce3fd8662a8f2b8001a5362d7b57921