CE to EE merge for RC1
What?
Last of the ce-to-ee merges for 9-5 RC1, this includes the following
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13477 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13470
No conflicts
Last of the ce-to-ee merges for 9-5 RC1, this includes the following
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13477 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13470
No conflicts