Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

	src/utils_dns.c

diff --cc src/collectd.c
Simple merge

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/common.c
Simple merge

diff --cc src/email.c
Simple merge

diff --cc src/ipmi.c
Simple merge

diff --cc src/rrdtool.c
Simple merge

diff --cc src/unixsock.c
Simple merge

diff --cc src/utils_dns.c
index c16ca52,5316a71..c16b3c1
--- 1/src/utils_dns.c
--- 2/src/utils_dns.c
+++ b/src/utils_dns.c
@@@ -34,7 -34,7 +34,8 @@@
   */
  
  #include "collectd.h"
+ #include "plugin.h"
 +#include "common.h"
  
  #if HAVE_NETINET_IN_SYSTM_H
  # include <netinet/in_systm.h>