Merge remote-tracking branch 'github/pr/2258'

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/collectd-nagios.c
Simple merge

diff --cc src/collectd-tg.c
Simple merge

diff --cc src/collectdctl.c
Simple merge

diff --cc src/libcollectdclient/client.c
Simple merge