Handle workspaces already in ADS

Refs #10443