Merge commit 'upstream/2.6.1p2'

Conflicts:
	server-src/diskfile.c

diff --cc client-src/selfcheck.c
Simple merge

diff --cc man/amanda.conf.5
Simple merge

diff --cc man/disklist.5
Simple merge

diff --cc man/xml-source/amanda.conf.5.xml
Simple merge