Closes #1660 (closed) This has to be backported along with each-rndc-netmgr-pt1 to v9.16.
This will create a new commit in order to revert the existing changes.
