Backport avatar-related spec changes from gitlab-org/gitlab-ee@4b464eaaee
What does this MR do?
I've had to fix avatar-related spec failures in the Tuesday CE upstream MR, this is the backport of https://gitlab.com/gitlab-org/gitlab-ee/commit/4b464eaaee2821411eb8fd2268225a99e8e21e99.