Merge topic 'gl2ps-scalar-bar-fix' into pv-master

9f33a74 Move scalar bar GL2PS special case handler from PV to VTK.
3fff279 Fix typo in GL2PSExporter.
Merge topic 'forward-vtk-to-master' into pv-master

d78f12d Merge topic '14130_add_java_window_ready_callback' into master
88a478d Merge topic 'qt5-set-target-properties' into master
f8cf6f0 Merge topic 'gl2ps-scalar-bar-fix' into master
058b2c4 Add Java callback when window is ready
5bed0e0 Merge topic 'Wlogical-not-parentheses' into master
c2909e4 Merge remote-tracking branch 'pvvtk/pv-master' into HEAD
bd047eb Merge remote-tracking branch 'pvvtk/pv-master' into HEAD
8147525 ENH: fix std::string usage
e9556d3 Merge branch 'remove_debug_statement'
1285985 Merge topic '14098-skip-invalid-points-2-rel' into master
27cbcc1 Merge branch 'tests_sans_data'
ed2988d Merge topic '14098-skip-invalid-points-2' into master
3ed8ae6 Fix bounds calculation for vtkPlotPoints with bad points
5a5b3d2 Render trailing good points in line/point plots
ba56a23 Fixed warnings given by clang 3.4's new -Wlogical-not-parentheses warning
bf8be07 Merge branch 'release'
...
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: I365cac709f4d76e10fee21fe1ec44e84976c5c9f