refs #10333. Merge in master and fix conflicts.

Merge branch 'master' into feature/10333_osx_nxspe

Conflicts:
	Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp
Revert "Merge remote-tracking branch 'origin/feature/10376_refl_ui_menu_bar'"

This reverts commit f2a383e23964f2b2cd30a35ebae45a41b8505bf1, reversing
changes made to a841023b0767f1283dc34fa577dd0153b84bfcf8.
Merge pull request #48 from mantidproject/feature/10333_osx_nxspe

Feature/10333 osx nxspe
Refs #10398 Add more aggressive testing

These invalid inputs should throw an exception.
Refs #10398 Update parseKeyValueString to satisfy unit test
Merge branch 'feature/10398_missing_tests' into develop