Merge branch 'collectd-4.3' into collectd-4.4

diff --cc src/apache.c
Simple merge

diff --cc src/cpu.c
Simple merge

diff --cc src/disk.c
Simple merge

diff --cc src/email.c
Simple merge

diff --cc src/iptables.c
Simple merge

diff --cc src/network.c
Simple merge

diff --cc src/nginx.c
Simple merge

diff --cc src/ntpd.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/rrdtool.c
Simple merge

diff --cc src/users.c
Simple merge

diff --cc src/utils_cmd_putval.c
Simple merge