Changed templates/default/gitlab.yml.erb satellites path to use the @git_home variable
Merging satellites-path