Merge branch 'master' into trac2023

diff --cc src/bin/ddns/tests/ddns_test.py
Simple merge

diff --cc src/bin/zonemgr/tests/zonemgr_test.py
Simple merge

diff --cc src/bin/zonemgr/zonemgr.py.in
Simple merge