Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

	src/unixsock.c

diff --cc configure.in
Simple merge

diff --cc src/collectd-unixsock.pod
Simple merge

diff --cc src/liboconfig/parser.y
Simple merge

diff --cc src/perl.c
Simple merge