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 844c83be05ba233202ccdc4069eee4838a481839,688c297a2c5917ecfc536a73e70751a4f0c8e1ec..c047a1a61271be72bcfbfead946b0a78dbc57910
--- 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