Merge branch 'master' into trac2672

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

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

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

diff --cc src/lib/python/isc/ddns/session.py
index b9b44f35ac160a4be6d7f28936df2c8d413f6bdd,373a39db9d63e7821ba10ecdfe5e9b2ef60266ef..3368523fdba9d19953e32f218aab83ce49775017
--- 1/src/lib/python/isc/ddns/session.py
--- 2/src/lib/python/isc/ddns/session.py
+++ b/src/lib/python/isc/ddns/session.py
@@@ -850,10 -850,10 +850,10 @@@ class UpdateSession
                      self.__do_update_delete_rrs_from_rrset(rrset)
  
              self.__diff.commit()
-             return Rcode.NOERROR()
+             return Rcode.NOERROR
          except isc.datasrc.Error as dse:
 -            logger.info(LIBDDNS_UPDATE_DATASRC_ERROR, dse)
 +            logger.info(LIBDDNS_UPDATE_DATASRC_COMMIT_FAILED, dse)
-             return Rcode.SERVFAIL()
+             return Rcode.SERVFAIL
          except Exception as uce:
              logger.error(LIBDDNS_UPDATE_UNCAUGHT_EXCEPTION,
                           ClientFormatter(self.__client_addr),