Move VisItBridge forward

Point to merge commit in master

Change-Id: Ic5075048f232a4de1937e21fc713a84821672bfb
Move Xdmf2 forward

Point to merge commit

Change-Id: Idd61f522374844aa865810bb0637cc71dc47e498
Move VTK forward

Point to new merge commit

Change-Id: I1b3fd0cf83c2886a488eaeb9d8823d645029e66f
Merge topic '12924_fix_zlib_build_issues' into 0013007_vtk-6

Change-Id: I1dbbf2e743ba55866468fa47459a583f38894b86
Merge topic 'chart-proxy-improvements' into 0013007_vtk-6

Conflicts:
	ParaViewCore/ClientServerCore/vtkPVParallelCoordinatesRepresentation.cxx
	ParaViewCore/VTKExtensions/vtkXYChartNamedOptions.cxx

Change-Id: Ib245badc6ee939c45236c3d368e5ae8c623f8198
Merge topic 'clang-fixes' into 0013007_vtk-6

Change-Id: I4db783caf67521aa592cbcf7babf8474a48b468e
Merge topic '0013007_vtk-6' into next

99671bb Merge topic 'clang-fixes' into 0013007_vtk-6
7a4c8c1 Merge topic 'chart-proxy-improvements' into 0013007_vtk-6
b82f5d3 Merge topic '12924_fix_zlib_build_issues' into 0013007_vtk-6
d32df7d Move VTK forward
d00c138 Move Xdmf2 forward
699c992 Move VisItBridge forward
9c3badf Move VTK forward
65c021a Change ExecuteData(...) to ExecuteDataWithInformation(...)
41310e2 Move VTK forward
594e264 COMP: Update vtkPVSynchronizedRenderer to explcitly use vktOpenGLRenderer
9609594 Fix merge of "Bug: 9334 Normal Glyphs returns error ..."
cb916eb COMP: Replace SetPipelineInformation(...) with new API
d13fc2e COMP: Remove reference to GetProducerPort()
9f162d4 COMP: Replace SetScalarTypeToUnsignedChar(...) call with new API
683ecf2 COMP: AddInput(...) => AddInputData(...)
0f625d0 COMP: Add call to GetPointer()
...
Merge topic 'chart-proxy-improvements'

5402431 update scatter plot and parallel coordinates to use options
99cd0a7 Update plot matrix to use chartseirs model
a29353c Update paraview to use the renamed model class
8bb3732 Rename the pqParallelCoordinateSettingsModel class
2fa324b Proxy updates for the charts.
5f20626 Move variables to protected, and specialize.
1e9561a Refactoring the chart named option objects.
4dc5d89 Move the class, help git see the move.
fe070bc Use vtkNew to store the color series object.
1b978f9 BUG: Reset column visibility when the columns change.
1a9ae1e BUG: Prevent a possible crash if Options is NULL.
Merge topic '12625-multi-servers-testing'

76c6d0c Make sure we find the plugin and not another file type
e4ff0a9 Make sure the test driver detect properly errors and process start
37de8a9 Add python testing for multi-server
3e50aff Fix driver test to work with built-in session
e7a1ee3 Revert "Revert "Add support for multi-server testing""
055fb78 Revert "Add support for multi-server testing"
f9bf916 Add support for multi-server testing
Merge topic '12951_fix_calculator'

7bb897c Fixing missing include.
44a7943 Fixed bug due to duplicate names being added.
Merge topic '12981_fix_top_right_chart_axes'

7ea1b5d Bringing in VTK Topic T21512981: 12981_fix_top_right_chart_axes
Merge topic 'refactor_pqPropertyLinks'

9c961fd Restore testing-group size.
96ae038 Use pqTimer to ensure testing playback works correctly.
4406215 Bring in QtTesting fixes
534c4f8 Fixed issues with settings getting messed up with running parallel tests.
5fb1114 Fixed screencapture issues with charts.
061c250 Use pqTimer instead of QTimer to make test playback reliable.
2ef98a5 Update QtTesting to bring in pqTimer changes.
2d5f4a0 Respect non-parallel runs for collaboration tests.
002a17b Register timers with pqEventDispatcher.
9e9d13d Register timers with testing framework.
ad9a31d Bring in Qt/Testing changed to add support to register timers.
6d846c4 Testing enhancements.
ecf0c28 Cleanup API.
74b3b1f Using notify() instead of sendEvent()
1939530 Fixed issue with ExtractVOI panel.
261bdeb Cleanup test
...
Merge topic '12924_fix_zlib_build_issues'

b761df1 BUG #12924. Fix build issue with zlib 1.2.6
Merge topic 'clang-fixes'

b13bdcf Merge topic '12924_fix_zlib_build_issues' into clang-fixes
a725326 Update VisItBridge to get fixes for clang build.
Merge topic '12987-vr-improve-response'

b820c57 Adding a few comments to better explain logic
529594f The dispatcher does a render at the end of interaction update
a726500 Remove StillRender() calls
435282a Seperating update into update () and render()
update VTK
Merge topic 'wand-sync-update' into next

45a8372 update VTK
1dacb90 Merge topic 'chart-proxy-improvements'
Merge topic 'wand-sync-update'

45a8372 update VTK
Merge topic '12984_vtk_pyramid_fixes'

6cfa773 BUG 12984. Bringing in vtkPyramid fixes for VTK as indicated in bug report.
Merge branch 'master' into next

* master:

Conflicts:
	VTK