Merge "Don't list nonexistent groups as addable or removable"