Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

	contrib/collection.cgi

diff --cc configure.in
index 567d542,162acd7..d02c12f
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -363,8 -418,14 +363,10 @@@ AC_HEADER_TIM
  # Checks for library functions.
  #
  AC_PROG_GCC_TRADITIONAL
 -AC_CHECK_FUNCS(gettimeofday select strdup strtol)
 -AC_CHECK_FUNCS(getaddrinfo getnameinfo)
 -AC_CHECK_FUNCS(strchr memcpy strstr strcmp strncmp strncpy strlen)
 -AC_CHECK_FUNCS(strncasecmp strcasecmp)
 -AC_CHECK_FUNCS(openlog syslog closelog)
 +AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog)
  
+ AC_FUNC_STRERROR_R
+ 
  AC_CHECK_FUNCS(getpwnam_r)
  AC_CHECK_FUNCS(getgrnam_r)