CE upstream - Saturday

Closes gitlab-ce#36970 and gitlab-qa#122

See merge request gitlab-org/gitlab-ee!3879