Conflicts: Update to git 2.16.4
There are conflicts when trying to pick https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/66 into gitlab.com/omnibus-gitlab#master
Edited by Mayra Cabrera
There are conflicts when trying to pick https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/66 into gitlab.com/omnibus-gitlab#master