[master] Finished merge of trac5061 (database port and Cassandra fixes)

diff --cc ChangeLog
index 1ac890c07fc9adba12a5ed698b5012be76326d49,8bbfea043492d8b228bbd01acf5e577b08e12d58..a800b8b316449a810ff4d1af592f014548294a56
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,62 -1,3 +1,68 @@@
- 1219.   [func]         marcin
++1220. [func]          parisioa, fdupont, tomek
++      DHCPv4 and DHCPv6 parsers have updated to accept database port
++      parameter. The parameter for Cassandra is now called
++      "contact-points" (was "contact_points" previously).
++      (Trac #5061, git xxx)
++
++1219.   [func]                marcin
 +      Control Agent uses libkea-http to process commands over
 +      the RESTful interface.
 +        (Trac #5107, git 88ce715926a46b6b3832630116fc7782adc46c7b)
 +
 +1218. [func]          tmark, tomek
 +      Configuration parsing for D2 has been migrated to bison/flex
 +      and the SimpleParser framework.  This includes changes to
 +      libprocess which render the CPL agnostic to the underlying
 +      parsing mechanisms.
 +      (Trac #5110, git feb2cedc0936364a923ab78542a21114533dd0f5)
 +
 +1217. [func]          marcin
 +      Implemented libkea-http library.
 +      (Trac #5077, git cd72284b5b221e620770883db7e166c4d3ba7eb6)
 +      (Trac #5088, git 715d18f961801ffbd798a65b19459178c3a53857)
 +      (Trac #5099, git 7e8df7993f295431e2cb6a13858f746649c4e18d)
 +
 +1216. [func]          fdupont, tomek
 +      Command line option -t implemented for DHCPv4 and DHCPv6.  It
 +      allows configuration sanity checking. Note that not all parameters
 +      are completely checked. In particular, service and control channel
 +      sockets are not opened, and hook libraries are not loaded.
 +      (Trac #3770, git 1d12582e270935ee7b72548d9c66753f4eea4ca4)
 +
 +1215. [doc]           tomek
 +      Developer's Guide updated to cover flex/bison parser.
 +      (Trac #5112, git 44139d821c1f4e43dbff22d49101a0854e4f9f5b)
 +
 +1214. [func]          tomek
 +      Bison parser implemented for Control-agent. The code is able
 +      to syntactically parse input configuration, but the output
 +      is not used yet.
 +      (Trac #5076, git d99048aa5b90efa7812a75cdae98a0913470f5a6)
 +
 +1213. [bug]           fdupont
 +      Option string values containing comma can now be specified
 +      correctly by preceding comma with double backslashes (e.g.
 +      "foo\\,bar").
 +      (Trac #5105, git fa79ac2396aa94d7bac91bd12d3593ebaaa9386d)
 +
 +1212. [doc]           andreipavelQ
 +      Many spelling corrections.
 +      (Github #47, git a6a7ca1ced8c63c1e11ef4c572f09272340afdd7)
 +
 +1211. [func]          andreipavelQ
 +      Updated PostgreSQL version reporting to be in line with
 +      MySQL and Cassandra.
 +      (Github #42, git 7ef4a190facadd66775b4a44c696d1c4215616cd)
 +
 +1210. [doc]           andreipavelQ
 +      Doxygen version updated to 1.8.11.
 +      (Github #45, git ce72998382b62269823fa0dcbfa41dfa9c72b69e)
 +
 +1209. [func]          tomek
 +      Relay options are now printed in DHCPv6 when suffiently detailed
 +      debug logging is requested.
 +      (Trac #5131, git 5bf58b21fcf07f2e2e97275efa1f76cde913b30a)
 +
  1208. [func]          tomek
        Global DHCPv4 and DHCPv6 parsers have been migrated to the
        SimpleParser framework. Several parameters (renew-timer,

diff --cc doc/Makefile.am
Simple merge

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

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

diff --cc src/bin/dhcp4/dhcp4_lexer.ll
Simple merge

diff --cc src/bin/dhcp4/dhcp4_parser.yy
Simple merge

diff --cc src/bin/dhcp4/tests/parser_unittest.cc
Simple merge

diff --cc src/bin/dhcp6/dhcp6_lexer.ll
Simple merge

diff --cc src/bin/dhcp6/dhcp6_parser.yy
Simple merge

diff --cc src/lib/dhcpsrv/mysql_connection.cc
Simple merge

diff --cc src/lib/dhcpsrv/pgsql_connection.cc
Simple merge