Merge remote-tracking branch 'origin/bugfix/10104_conjoinworkspaces_fixspectrum'
Re #10119. Renaming f20 spec file to be the unified one.
Re #10119. Preparing to test resulting spec on copr.
Merge branch 'feature/10119_mantid_dev_spec' into develop