Backport filtered search lazy token consistent state fix
Backport filtered search lazy token consistent state fix.
EE backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2142
Backport filtered search lazy token consistent state fix.
EE backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2142