Merge topic '14926_fix_zoom_to_data_icon'

fb042123 Replaced icon for zoom to data button
Merge topic 'catalyst-edition-ordering'

862f7ac8 catalyst: Extras comes after Enable-Python
97a3fd0f catalyst: support ordering editions without requires
Merge topic 'catalyst-missing-proxy'

80796875 catalyst: add catalyst.xml to the SMApplication resource list
Merge topic 'fragments_meta_filter'

10664cba Adds the Fragments Filter that combines the others.
Merge topic 'introduce_histogram_representation'

99444f73 Reducing spacing between buttons.
7f864a90 Increase test threshold.
e2a8d47c Fix build issue with "round".
d9a4f0ee Bring in VTK fixes for empty selections (and others).
9746f1f2 Label selection types correctly.
4b96fbde Added test to validate histogram view selection linking.
729bdc03 Add ability to change histogram line style.
61b447c4 Remove need for PlotData for ScatterPlotMatrix view.
1438d861 Fix selections in PlotMatrixView/ScatterPlotMatrixView.
f1b64dd0 Removed unused pqHistogramTableModel.
9458982b Fixed selection in histogram view.
1162d307 Added support for two selection transformation.
2b16ad91 Added ability for selection representations to use original selection.
e05fd379 Cleanup Parallel Coorindates view.
8273f78d Refactoring transformation of selection for chart views.
b0f3fb05 Remove AnnotationLink from pqView.
...
Merge topic 'live-breakpoint'

c87f9d4d Revert commit 'reduce catalystlive running time'.
ca06b268 Allow more time for Catalyst to send data (try to fix a test failure on Mac)
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I4bb908eb92753f4ca5f97e246259cc7b2f5bda61