Correct a couple of lines missed during the merge conflict.

Refs #10112.
Merge branch 'feature/10112_scrap_workspace_population' into develop