Merge branch 'stable-3.1' into 'stable-3.1'

interface/web/admin/server_config_edit.php

interface/web/admin/templates/server_config_cron_edit.htm

interface/web/admin/templates/server_config_dns_edit.htm

interface/web/admin/templates/server_config_fastcgi_edit.htm

interface/web/admin/templates/server_config_getmail_edit.htm

interface/web/admin/templates/server_config_jailkit_edit.htm

interface/web/admin/templates/server_config_mail_edit.htm

interface/web/admin/templates/server_config_rescue_edit.htm

interface/web/admin/templates/server_config_server_edit.htm

interface/web/admin/templates/server_config_ufw_edit.htm

interface/web/admin/templates/server_config_vlogger_edit.htm

interface/web/admin/templates/server_config_web_edit.htm

interface/web/admin/templates/server_config_xmpp_edit.htm

interface/web/tools/resync.php