[master] Finished merge of trac5227 (adding easy missing option defs) after pull

diff --cc ChangeLog
index 977bb539f28c59f56e208a1bc2ec26c7e842224f,e5e983965ce294f597ffd183e650523e241f9afc..5c135168c4605860b0c4929fb2278523c4779c62
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
- 1300. [func]          fdupont
++1301. [func]          fdupont
 +      Added some standard option definitions which are supported
 +      by ISC DHCP but not (yet) by Kea.
 +      (Trac #5227, git xxx)
 +
+ 1300. [doc]           tomek
+       Documentation for shared networks added.
+       (Trac #5310, git 41fd3bb7ed2f4cd15db6cbd14713f4474f659c92)
+ 
  1299. [doc]           fdupont, tmark
        Added an example stunnel configuration file to demonstrate
        using kea-shell through https.

diff --cc doc/guide/dhcp4-srv.xml
Simple merge

diff --cc doc/guide/dhcp6-srv.xml
Simple merge