Merge topic '14279_glyph_filter' into pv-master

82a0c473 Don't glyph masked points in vtkUniformGrid.
Merge topic 'fix_invalid_socket_check' into pv-master

73739ae0 BUG: Fix invalid return value check in vtkClientSocket.
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: Id8563c232cac8f2621cb5179d6c523cc21a82c16