Reapply "Merge branch '451096-remove-ff' into 'master'"

Apply fix for project searches, always include filtered
and archived projects when doing a single project search

This reverts commit 9be0a10d.

Changelog: other
EE: true