Merge branch 'collectd-4.4'

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/memory.c
Simple merge

diff --cc src/utils_threshold.c
Simple merge