Merge branch 'sh-gitaly-update-for-11-10' into '11-10-stable-patch-6'
[11.10] Use 3-way merge for squashing commits See merge request gitlab-org/gitlab-ce!28078
[11.10] Use 3-way merge for squashing commits See merge request gitlab-org/gitlab-ce!28078