Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

diff --cc NEWS
Simple merge

diff --cc doc/manpages/man5/afp.conf.5.xml
Simple merge

diff --cc etc/afpd/afp_dsi.c
Simple merge

diff --cc etc/afpd/auth.c
Simple merge

diff --cc etc/uams/uams_dhx2_pam.c
Simple merge

diff --cc include/atalk/globals.h
Simple merge

diff --cc libatalk/util/netatalk_conf.c
Simple merge

diff --cc man/man5/afp.conf.5.in
Simple merge