Merge branch 'collectd-5.6' into collectd-5.7

diff --cc contrib/redhat/collectd.spec
Simple merge

diff --cc src/network.c
Simple merge

diff --cc src/ntpd.c
Simple merge

diff --cc src/perl.c
Simple merge