Merge branch 'master' of ssh://git.kea.isc.org/git/kea

# Conflicts:
#	ChangeLog

diff --cc ChangeLog
index 61a7d22b107b2d4b38c3ec9e94d3267347bd318c,4b116b1ec820c9930ce0d7534305ad16aa7fde5f..dbee300e6ca2962067065e7f2978640e6f78807e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
- 1255. [bug]           tomek
++1256. [bug]           tomek
 +      Control Agent now writes proper configuration when using
 +      config-write command.
 +      (Trac #5253, git a1b5da4db6ebfa9635bbe411ec363cdcc4fd1d28)
 +
+ 1255. [bug]           marcin
+       Fixed failing unit tests in libkea-http.
+       (Trac #5260, git 43394f76efb1634155c04b205dec7361fc21f4f9)
+ 
  1254. [func]          tomek
        Various improvements needed for upcoming host commands library:
        host data source is now able to delete hosts, hosts can be exported