Fix includes after 2550 (#2722)

* Fix includes after 2550

* Add upgrade script

install/deb/templates/mail/nginx/default_disabled.stpl

@@ -21,5 +21,5 @@ server {
 
     proxy_hide_header Upgrade;
     
-    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
+    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;
 }

install/deb/templates/mail/nginx/default_disabled.tpl

@@ -16,6 +16,6 @@ include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*;
         proxy_pass  http://%ip%:%web_port%;
     }
     
-include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*;
+    include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*;
 
 }

install/upgrade/versions/1.6.3.sh

@@ -17,7 +17,7 @@
 
 upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'no'
 upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'no'
-upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'no'
-upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'yes'
+upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'yes'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'