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

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

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

diff --cc src/dbi.c
Simple merge

diff --cc src/oracle.c
Simple merge

diff --cc src/postgresql.c
Simple merge