[master] Merge branch 'trac3508' (version reporting)

Conflicts:
	ChangeLog

diff --cc ChangeLog
index ff6d1ba066bb3fab4296434fb6f4a9932b4d73e7,b81a9a45e4d650c1ab3614921a41d2ee69e47ce7..a0032c3d6e5bc02b352ce31c436a5b5e8a96b20c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,6 +1,15 @@@
 -8xx.  [func]          tomek
++818.  [func]          tomek
+       DHCPv4,DHCPv6 and DDNS components now report their versions.
 -      (Trac #3508, git tbd)
++      (Trac #3508, git 3f46c74ffa0ea1197e1fa62cb2f6580931be35f3)
++
 +817.  [bug]           marcin
 +      DHCPv4 and DHCPv6 servers will log an error during an attempt to
 +      open socket on the interface which is down or not configured.
 +      (Trac #3487, git fadc776914aa858ce637aab1513ab3d87631f612)
 +
 +816.  [doc]           tomek
 +      AUTHORS file rewritten.
 +      (Trac #3469, git 6ef55abaa1ef79e09ad332c0da28dee7bfed70fe)
  
  815.  [func]          tomek
        Pool definitions in DHCPv4 and DHCPv6 are now lists of

diff --cc src/bin/dhcp4/dhcp4_messages.mes
Simple merge

diff --cc src/bin/dhcp4/dhcp4_srv.cc
Simple merge

diff --cc src/bin/dhcp6/dhcp6_messages.mes
Simple merge

diff --cc src/bin/dhcp6/dhcp6_srv.cc
Simple merge