Merge branch 'collectd-5.4' into collectd-5.5

diff --cc src/daemon/plugin.c
index 3da8eccbb3b2b147f8042c866ded54ee788fe127,6d3d3c9520ac770e4d098475b9c9a22ab14ce8c4..e7d4e8df2c801b7e6d0a0e6a8bdd4e120cedbf20
--- 1/src/daemon/plugin.c
--- 2/src/plugin.c
+++ b/src/daemon/plugin.c
@@@ -1650,9 -1536,8 +1648,11 @@@ void plugin_init_all (void
                le = le->next;
        }
  
+       start_write_threads ((size_t) write_threads_num);
+ 
 +      max_read_interval = global_option_get_time ("MaxReadInterval",
 +                      DEFAULT_MAX_READ_INTERVAL);
 +
        /* Start read-threads */
        if (read_heap != NULL)
        {

diff --cc src/snmp.c
Simple merge