Merge branch 'collectd-5.5' into collectd-5.6

diff --cc src/daemon/plugin.c
Simple merge

diff --cc src/network.c
index 51c0757,f114060..9a0f429
--- 1/src/network.c
--- 2/src/network.c
+++ b/src/network.c
@@@ -3449,15 -3558,7 +3444,7 @@@ static int network_init (void
                return (0);
        have_init = 1;
  
- #if HAVE_LIBGCRYPT
-       if (network_init_gcrypt () < 0)
-       {
-               ERROR ("network plugin: Failed to initialize crypto library.");
-               return (-1);
-       }
- #endif
- 
 -      if (network_config_stats != 0)
 +      if (network_config_stats)
                plugin_register_read ("network", network_stats_read);
  
        plugin_register_shutdown ("network", network_shutdown);