Merge branch 'collectd-4.5' into collectd-4.6

diff --cc src/apcups.c
Simple merge

diff --cc src/battery.c
Simple merge

diff --cc src/exec.c
Simple merge

diff --cc src/hddtemp.c
Simple merge

diff --cc src/ipmi.c
Simple merge

diff --cc src/iptables.c
Simple merge

diff --cc src/irq.c
Simple merge

diff --cc src/load.c
Simple merge

diff --cc src/mbmon.c
Simple merge

diff --cc src/memcached.c
Simple merge

diff --cc src/nginx.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/sensors.c
Simple merge

diff --cc src/tcpconns.c
Simple merge

diff --cc src/users.c
Simple merge

diff --cc src/vserver.c
Simple merge