Merge branch 'collectd-4.8' into collectd-4.9

diff --cc README
Simple merge

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.in
index 844c83b,688c297..c047a1a
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -562,10 -502,9 +562,10 @@@ FQDNLookup   tru
  
  #<Plugin perl>
  #     IncludeDir "/my/include/path"
- #     BaseName "Collectd::Plugin"
+ #     BaseName "Collectd::Plugins"
  #     EnableDebugger ""
 -#     LoadPlugin foo
 +#     LoadPlugin Monitorus
 +#     LoadPlugin OpenVZ
  #
  #     <Plugin foo>
  #             Foo "Bar"

diff --cc src/network.c
Simple merge