Refs #7807 Fix for failing unit test
Merge branch 'feature/7807_group_workspace_name_clash' into develop