Backport EE specific cluster spec changes to CE
What does this MR do?
EE part in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5638
What are the relevant issue numbers?
Edited by Matija Čupić
EE part in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5638