Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	src/filter_chain.c
	src/meta_data.c
	src/target_notification.c
	src/target_replace.c
	src/target_set.c

diff --cc src/bind.c
Simple merge

diff --cc src/memory.c
Simple merge