Reviewed commit 9fa0b393ce4019c32096bbbda48da7229c37103d

The change looks OK and the nsupdate test passed on the Jenkins Fedora 26 and CentOS 7 machines (as well as others).

Please merge.