[master] Finishing merge of (forensic/legal logging to database)

diff --cc ChangeLog
index 4fd88cfb02c4c8e45cea1ca11c7de699baec4c68,5305982311f579575c2814d8b443f93f7c8aa960..8e361a3e87bd724a6070e25bef12e29fe50b845a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,25 +1,29 @@@
- 1359. [func]          fdupont
++1362. [func]          fdupont
 +      Extended forensic (aka legal) logging with database capability.
 +      (Trac #5420, git xxx)
 +
+ 1361. [func]          tmark
+       Added support for automatically recalculating lease statistics
+       to the CQL backend.
+       (Trac 5487, git c807388d581ee1c3e479324f3c399f27feba1c96)
+ 
+ 1360. [func]          razvan, andrei
+       A new parameter exit-wait-time has been added to perfdhcp. It is
+       now possible to tell perfdhcp to wait certain amount of time after
+       exit conditions are met before actuallying terminating.
+       (github #55, git 0cd1178ae092fa0c2f122d0e16fb673b4074a6e6)
+ 
+ 1359. [func]          razvan, andrei, tomek
+       Support for Google Benchmark has been added. To compile
+       benchmarking support, please use --with-benchmark option.
+       (Github #36, git d6819971410b460d7742c762844e2e75ba580944)
+ 
  1358. [build,bug]     fdupont
        Cassandra build fixes for macOS.
-       (Trac #5494, git 51fd66d364fab2da37fc12557b78bf9863df78d3)
+       (Trac #5494, git cb0d735628aefd6bca2acc11b73d1f66b45d1c40)
  
  1357. [bug]           rcgoodfellow
-       Fixed bug in kea-admon causing error on lease-dump.
+       Fixed bug in kea-admin causing error on lease-dump.
        (github #61, git 2c9454ec56edc8f3cff8a23329f53ced0d172280)
  
  1356. [func]          andreipavelQ,tomek

diff --cc src/lib/dhcpsrv/Makefile.am
Simple merge