Refs #6622 Put workspaces in correct groups.