Add smtp settings override in smtp_settings sample file.
Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq