Prepare 10.6 RC1
This is a merge of 10-6-stable
with conflict resolutions from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4869
This is a merge of 10-6-stable
with conflict resolutions from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4869