Better error messages, re #8419
New mantidplotpy test: MantidPlotInputArgsCheck, re #8419
remove reminder comment, re #8419
Merge branch 'master' into bugfix/10064_indirect_resolution_algorithm_refactor

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReduction.ui
	Code/Mantid/MantidQt/CustomInterfaces/src/IndirectCalibration.cpp
	Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

Refs #10064
Merge branch 'master' into feature/9842_mc_absorb_hollow_cylinder

Conflicts:
	Code/Mantid/Framework/Geometry/CMakeLists.txt
Refs #9842
Fix Geometry CMakeLists after class removal.

Refs #9842
Fix errors from a bad rebase

Refs #9842
Catch (good) exceptions so that jenkin's tests don't fail, re #8419
Toggle smooth option when RES is toggled

Refs #10064
Refs #10194 faster save, output verified with DAWN software
Fix subtle bug in CopySample introduced by combining Object/Material.

Refs #9842
Resolution working on UI

Refs #10064
Merge branch 'master' into feature/8802_convolve_option_for_conv_fit

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui

Refs #8802
Re #10355 check boundary constraints
Merge remote-tracking branch 'origin/feature/10227_gui_filter_events'
Move convolve option to property tree

Refs #8802
Merge remote-tracking branch 'origin/feature/10343_delete_macro_HAS_UNORDERED_MAP_H'
Refs #10194 attempting to fix build error
Convert Y axis to value for increment

refs #10324
Refs #10194 attempting to fix build error