Merge branch 'collectd-5.5'

diff --cc src/Makefile.am
index 956d772,dc07cb7..d54094f
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -335,11 -317,8 +335,11 @@@ endi
  if BUILD_WITH_LIBUDEV
  disk_la_CFLAGS += $(BUILD_WITH_LIBUDEV_CFLAGS)
  disk_la_LDFLAGS += $(BUILD_WITH_LIBUDEV_LDFLAGS)
- disk_la_LIBADD += $(BULD_WITH_LIBUDEV_LIBS)
+ disk_la_LIBADD += $(BUILD_WITH_LIBUDEV_LIBS)
  endif
 +if BUILD_FREEBSD
 +disk_la_LIBADD += -ldevstat -lgeom
 +endif
  if BUILD_WITH_PERFSTAT
  disk_la_LIBADD += -lperfstat
  endif