Refs #8646 fix merge conflict
Merge remote-tracking branch 'origin/feature/8761_convolve_workspaces'
Merge remote-tracking branch 'origin/feature/8724_support_back_to_back'
Added SNS ICAT4 Refs #8811
Restored SNS computeResource fermi --- Refs #8811
Merge branch 'feature/8811_icat_sns' into develop