Fix failed merge when filename is the same as target branchname.
Remove outdated comments.
Merge branch 'satellite_merge' of /home/git/repositories/gitlab/gitlabhq