Merge branch 'collectd-4.4'

Merge branch 'collectd-4.4'

Conflicts:

	src/apache.c
	src/apcups.c
	src/apple_sensors.c
	src/battery.c
	src/cpu.c
	src/cpufreq.c
	src/df.c
	src/disk.c
	src/dns.c
	src/email.c
	src/entropy.c
	src/hddtemp.c
	src/interface.c
	src/ipvs.c
	src/irq.c
	src/load.c
	src/mbmon.c
	src/memcached.c
	src/memory.c
	src/multimeter.c
	src/mysql.c
	src/netlink.c
	src/network.c
	src/nfs.c
	src/nginx.c
	src/ntpd.c
	src/nut.c
	src/ping.c
	src/processes.c
	src/rrdtool.c
	src/serial.c
	src/snmp.c
	src/swap.c
	src/tape.c
	src/tcpconns.c
	src/users.c
	src/utils_cmd_putval.c
	src/vserver.c
	src/wireless.c
	src/xmms.c