Merge branch 'collectd-5.5'

diff --cc configure.ac
Simple merge

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

diff --cc src/md.c
Simple merge

diff --cc src/utils_db_query.c
Simple merge