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

(*) condition on smtp_authentication was applied by hand on smtp_settings.rb.in