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

diff --cc bindings/java/org/collectd/api/Collectd.java
Simple merge

diff --cc bindings/java/org/collectd/java/GenericJMXConfConnection.java
Simple merge

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

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

diff --cc src/collectd.c
Simple merge

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

diff --cc src/collectd.h
Simple merge

diff --cc src/configfile.c
Simple merge

diff --cc src/conntrack.c
Simple merge

diff --cc src/cpu.c
Simple merge

diff --cc src/java.c
Simple merge

diff --cc src/onewire.c
Simple merge

diff --cc src/utils_cmd_putnotif.c
Simple merge

diff --cc src/utils_db_query.c
Simple merge

diff --cc src/utils_latency.c
Simple merge

diff --cc src/utils_parse_option.c
Simple merge