Merge topic '15071_trace_solid_color_changes'

1a29ff4c Remove debugging couts.
333583a3 Remove "Extract Location" from the toolbar.
732fc80c BUG #15071: Trace changes to solid color.
Merge topic '15153_fix_volume_colormap'

71054832 BUG #15153: Update color map for the LOD mapper.
Merge topic 'remove_pqActiveView'

74ff1014 Removed pqActiveView.
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ie0ab61b06fc9f63926e94b06365b202fb402b307
testing: add mangling to pvbatch tests

Without this, a call to paraview_add_test_python and
paraview_add_test_pvbatch with the same files will cause conflicts.

Change-Id: I95e4427b490ec22001d6211bc7aba720eb4276c3
vtkPVFileInformation: more NULL checking on Apple

Change-Id: I66d049699d19fcaf34ea3c851e9f165034717980
Merge topic 'mangle-pvbatch-test-names' into next

aaa72f5f testing: add mangling to pvbatch tests
Merge topic 'cfapi-null-logic' into next

50fa2695 vtkPVFileInformation: more NULL checking on Apple
Add documentation about mode_shape to the Exodus reader.

Change-Id: Iedbb901685be021f976ef17ed28d6f8fb31cb148
Move VTK: Rename data_index to mode_shape in Exodus reader

Change-Id: I431bf9862dde8495b0f30bb33be2f92486806821
fixup! vtkPVFileInformation: more NULL checking on Apple

Change-Id: I0c96ebf1d3f3558f79e198af40fe7635e76f1d00
Merge topic 'cfapi-null-logic' into next

c343cd6b fixup! vtkPVFileInformation: more NULL checking on Apple
Merge topic 'exodus-15127' into next

f44839d3 Move VTK: Rename data_index to mode_shape in Exodus reader
f107463f Add documentation about mode_shape to the Exodus reader.
catalyst: update the rendering edition

It's missing

Change-Id: I07548664315872fcfdfa9e946a45fc4042826ed0
Merge topic 'update-catalyst-20141215' into next

e0701e7b catalyst: update the rendering edition
fixup! testing: add mangling to pvbatch tests

Change-Id: I7a3f167589590cf3979faf087fda26cb76b96d58
Merge topic 'mangle-pvbatch-test-names' into next

e5ada758 fixup! testing: add mangling to pvbatch tests
testing: add mangling to pvbatch tests

Without this, a call to paraview_add_test_python and
paraview_add_test_pvbatch with the same files will cause conflicts.

Change-Id: I95e4427b490ec22001d6211bc7aba720eb4276c3
Merge topic 'mangle-pvbatch-test-names' into next

4d65c068 testing: add mangling to pvbatch tests