Merge branch 'collectd-5.5'

diff --cc configure.ac
Simple merge

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

diff --cc src/tail.c
Simple merge

diff --cc src/tail_csv.c
Simple merge