pqContourWidget is now smarter on deciding what representation to use.

Change-Id: I9843b9cec2ce5704fbbf5b63b7be26fd8360c98c
Make the marker structure consistent across processors

Change-Id: Ibf4c3fbe4873bff7d64cfbc83bfe5ef13af515b0
Merge topic '14208_cth_reader_crash_on_open' into 14209_cth_markers_error_message

Conflicts:
	ParaViewCore/VTKExtensions/Default/vtkSpyPlotReader.cxx

Change-Id: I5ff3c56bc509d9368413a91b882fdf7c374503cb
Merge topic '14209_cth_markers_error_message' into next

a7573fb Merge topic '14208_cth_reader_crash_on_open' into 14209_cth_markers_error_message
022a5ff Make the marker structure consistent across processors
234c0a1 pqContourWidget is now smarter on deciding what representation to use.