Merge branch 'collectd-5.5'

diff --cc src/Makefile.am
Simple merge

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

diff --cc src/modbus.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/tail.c
Simple merge