Merge branch 'patch-5' into 'master'

Fix issue where "Without projects" filter admin area shows 0 users incorrectly. Before this fix, if any outstanding group or project invitations exist the count show as 0.

Fixes #3367

See merge request !6611