Correct WorkspaceSelector to avoid duplicate workspace names

re #6227
Merge branch 'bugfix/6227_sans_1d_analysis' into develop