Merge branch 'approvals-spec-fix-for-816' into '8-16-stable-ee'

Fix approvals spec. This was merged to 8-16-stable-ee directly with https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1231 but I think this should also go into master, and be picked to 8-17-stable-ee.

See merge request !1231 (merged)