Merge branch 'collectd-5.4' into collectd-5.5

diff --cc src/email.c
Simple merge

diff --cc src/liboconfig/parser.y
Simple merge

diff --cc src/network.c
Simple merge