Merge branch 'collectd-5.6'

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

diff --cc src/daemon/plugin.h
Simple merge

diff --cc src/write_graphite.c
Simple merge

diff --cc src/write_http.c
Simple merge