Merge branch 'collectd-5.4' into collectd-5.5

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

diff --cc src/df.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/pinba.c
Simple merge

diff --cc src/postgresql.c
Simple merge

diff --cc src/table.c
Simple merge

diff --cc src/teamspeak2.c
Simple merge

diff --cc src/threshold.c
Simple merge

diff --cc src/utils_fbhash.c
Simple merge

diff --cc src/vmem.c
Simple merge