Re #17949 Fixed merge conflicts

Fix "Plot surface/contour from group"

Restore "tiled plot" option lost from MantidPlot

Use ArrayProperty instead of manually parsed string in `GetEiMonDet2`

After WorkspaceView refactoring the mappings need updating to take into
account the new object names

Fix bug for adding multi period ws

Extract monitors bug when input WS and detector WS have the same name

Fix ISIS Powder - Abstract instrument unit test on Python 3

DataSelector to support all properties of it's two child widgets

re #17896

CorrectFlightPaths fix and rename

Fix issues raised by clang-tidy: misc-throw-by-value-catch-by-reference.

IN4 instrument definition file update

Remove Histogram Validator from ConvertSpectrumAxis

Pearl Powder Diffraction Script - Prep work

re #18009

Replace the "Tiled plot" option to the "Plot spectra..." dialog.

To do: restore the behaviour when this option is selected

re #18009

Fix multi-period event data loading bug for LARMOR

Update DownloadInstrument-v1.rst

Fix duplicate names for group workspace

Mantid crashes when loading data and algorithm widget is hidden