Revert "Merge remote-tracking branch 'origin/feature/7309_rename_ws_duplicate_name'"

This reverts commit c4677e36ad6bbeaa08e4fd9406ce5d8e81a2e7e4, reversing
changes made to 2621ef8b0dec497136114aa7143ead8794f6c54a.
Refs #7533
Merge remote-tracking branch 'origin/bugfix/7533_revert_changes_renameworkspace'