Merge branch '10-4-stable-prepare-rc7' of https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7