[master] Merge branch 'trac2018' with trivial conflicts

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

diff --cc src/lib/python/isc/ddns/libddns_messages.mes
Simple merge

diff --cc src/lib/python/isc/ddns/session.py
index 5759420a49ba29c60668ef9f68eab0a358d05911,bcbca91243016d295c5e87d4e64feeaedb0a713f..6cb2c98c110b41117cb37914b0e10cef24718eae
--- 1/src/lib/python/isc/ddns/session.py
--- 2/src/lib/python/isc/ddns/session.py
+++ b/src/lib/python/isc/ddns/session.py
@@@ -213,13 -214,8 +214,13 @@@ class UpdateSession
                  return UPDATE_ERROR, None, None
              self.__message = None
              return UPDATE_DROP, None, None
 +        except isc.datasrc.Error as e:
 +            logger.error(LIBDDNS_DATASRC_ERROR,
 +                         ClientFormatter(self.__client_addr, self.__tsig), e)
 +            self.__make_response(Rcode.SERVFAIL())
 +            return UPDATE_ERROR, None, None
  
-     def __get_update_zone(self):
+     def _get_update_zone(self):
          '''Parse the zone section and find the zone to be updated.
  
          If the zone section is valid and the specified zone is found in

diff --cc src/lib/python/isc/ddns/tests/session_tests.py
Simple merge