Already archived projects get unarchived when org is unarchived

[seav]

Steps to reproduce the error

1. In an active org with an active project, archive the project.
2. Archive the org.
3. Unarchive the org.

Actual behavior

The project archived in step 1 gets unarchived.

Expected behavior

The project archived in step 1 should remain archived. Since this project was archived before the org was archived, it should remain archived irrespective of the org's archived state unless it was specifically unarchived.

Possible solution

Don't archive the projects when an org is archived. But treat projects in an archived org as if they were archived as well regardless of the project's actual archived state.