Merge branch 'testing' into 7.0

conf/Template_Yunohost.xml

@@ -573,4 +573,4 @@ fi</description>
             </mappings>
         </value_map>
     </value_maps>
-</zabbix_export>
+</zabbix_export>

scripts/upgrade

@@ -117,9 +117,9 @@ if [ ! -d "/usr/share/zabbix-cli" ]; then
     ynh_secure_remove --file="/usr/share/zabbix-cli/.zabbix-cli_auth_token"
 fi
 
-import_template
+#import_template
 
-link_template
+#link_template
 
 #=================================================
 # START SYSTEMD SERVICE

tests.toml

@@ -20,3 +20,4 @@ test_format = 1.0
 
     test_upgrade_from.8f8961c239f890069c867e40005db98465add0c9.name = "5.0.20~ynh2"
     test_upgrade_from.2791ab29129baca48685277ce82ef763058b10cf.name = "5.0.41~ynh3"
+    test_upgrade_from.2ee2da0e3e8c95e90d78e234bcf2193869d115f8.name = "6.0~ynh2"