Update to resolve conflicts due to renamed files

Merge branch 'master' into write_graphite_reverse_host

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/utils/format_graphite/format_graphite.c
Simple merge

diff --cc src/utils/format_graphite/format_graphite.h
Simple merge

diff --cc src/write_graphite.c
Simple merge