[master] Merge branch 'trac3417' (bind10 removal from .cc/.h)

Conflicts:
	ChangeLog

diff --cc ChangeLog
index abdb65cdcdb0affe123b14101ff9d7e99d6d88ac,c0359e04e867863704809b714b2c25eee8507e41..ab612f82e1f3f524a4f3debca1c902c5c0171f55
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,9 +1,15 @@@
 -8XX.  [func]          tomek
++813.  [func]          tomek
+       Functions, methods and variables referring to BIND10 were renamed
+       to Kea. In particular, system variables (B10_LOGGER_ROOT,
+       B10_LOCKFILE_DIR_FROM_BUILD etc.) were renamed. B10_ prefix was
+       replaced with KEA_.
 -      (Trac #3417, git tbd)
++      (Trac #3417, git 1db8988de6af435fa388dc9c7f909c4a004a01d0)
++
 +812.  [doc]           tomek
 +      DHCPv6 and DDNS sections in Kea Administrator Reference Manual
 +      has been updated. Usage of keactl has been documented.
 +      (Trac #3468, git 3945fc6211bcadb9bece7147039a6b50ebcf936b)
 +      (Trac #3466, git fa9570d19c73cbe7effc75589b7eb855c411f6a3)
  
  811.  [doc]           tmark
        Added documentation of message protocol between DHCP servers and the

diff --cc src/lib/util/buffer.h
Simple merge