This does almost (*) only pure merge. We will slaposify / adjust config
and corresponding md5sum in the following patches.

gitlab_registry_http_config are put in comment

Conflicts:
	software/gitlab/template/gitlab.yml.in
	software/gitlab/template/nginx.conf.in
	software/gitlab/template/rack_attack.rb.in
	software/gitlab/template/smtp_settings.rb.erb