9-0-stable CE to EE 9-0-stable-ee
This includes a bunch of cherry-picked fixes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1398
This includes a bunch of cherry-picked fixes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1398