[master] Merge branch 'trac2027' with minor conflict

Conflicts:
	src/lib/python/isc/ddns/tests/session_tests.py

diff --cc src/lib/python/isc/ddns/tests/session_tests.py
index 0239bb1e14560ba282c762fdcf449fe9c2ee517f,c7b45ab73eccfb7c256d8dda3cca9655397f4b56..f7c2d3cbde2b080654e56aad2390f773a2ed7753
--- 1/src/lib/python/isc/ddns/tests/session_tests.py
--- 2/src/lib/python/isc/ddns/tests/session_tests.py
+++ b/src/lib/python/isc/ddns/tests/session_tests.py
@@@ -662,8 -662,8 +662,8 @@@ class SessionTest(SessionTestBase)
             creates an update session, and fills it with the list of rrsets
             from 'updates'. Then checks if __handle()
             results in a response with rcode 'expected'.'''
-         msg = create_update_msg([TEST_ZONE_RECORD], [], updates)
+         msg = create_update_msg([TEST_ZONE_RECORD], prerequisites, updates)
 -        zconfig = ZoneConfig([], TEST_RRCLASS, self._datasrc_client,
 +        zconfig = ZoneConfig(set(), TEST_RRCLASS, self._datasrc_client,
                               self._acl_map)
          session = UpdateSession(msg, TEST_CLIENT4, zconfig)