Merge commit 'upstream/3.2.0'

Conflicts:
	changer-src/chg-mcutil.sh

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

diff --cc example/amanda.conf.in
Simple merge

diff --cc example/template.d/dumptypes
Simple merge

diff --cc gnulib/regenerate/regenerate
index 6f42fa014782941304af48ccf11826cd02349de5,57565d78ef319fba1b4e6e6531188524d94c25cd..57565d78ef319fba1b4e6e6531188524d94c25cd
mode 100644,100755..100644
--- 1/gnulib/regenerate/regenerate
--- 2/gnulib/regenerate/regenerate
+++ b/gnulib/regenerate/regenerate

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

diff --cc man/disklist.5
Simple merge

diff --cc man/entities/global.entities.in
Simple merge

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

diff --cc server-src/diskfile.h
Simple merge