Fix shelling into a failed build sandbox with workspaces active

Tristan Van Berkomrequested to merge
tristan/fix-shell-worksace-files into master

Merge request reports