[#3004] addressed comments

[#3004] regenerated parsers

[#3003] output_options alias for output-options

[#2904] revert parsers grammar changes in ARM

[#2904] Updating ChangeLog

[#2904] revert alias output-options in examples

This reverts commit 12b00c890122313c8a912c4252054aab99bc07ad.

[#2904] ARM docs update

[#2904] updating alias output-options in examples

[#2904] adding alias output-options in ARM docs

[#3053] Additional review comments

src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc
    add use of SKIP_IF

src/lib/testutils/gtest_utils.h
    fixed typo

[#3053] SKIP_IF review comments

src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
src/lib/mysql/tests/mysql_connection_unittest.cc
    Added use of SKIP_IF()

src/lib/testutils/gtest_utils.h
    Commentary corrections

[#3053] Added SKIP_IF to gtest_utils.h

src/lib/testutils/gtest_utils.h
    Added macro SKIP_IF to work-around versions of googletest that
    do not have GTEST_SKIP

[#3031] compilation fix

[#2967] fixed clang-format settings

[#2967] addressed comments

[#2967] format file

[#2980] addressed comments

[#2980] add tar and git to install dependencies

[#2980] remove references of Centos 7

[#3011] minor spelling correction

[#3011] address review comments

refined and expanded Logging Message Format

[#3012] update rst_arm_sources with ping-check rst

[#3012] Addressed review comments

doc/sphinx/arm/hooks-ping-check.rst
    - minor edits.

Apply 1 suggestion(s) to 1 file(s)

[#3012] Add initial ping-check ARM doc

new file:   doc/sphinx/arm/hooks-ping-check.rst
modified:   doc/sphinx/arm/hooks.rst
modified:   doc/sphinx/conf.py

[#3009] addressed review comments

[#3009] distinct log messages for first and second client classification

[#3034] version in configure.ac bumped up

[#3029] release changes

[#3026] bump up library versions for 2.5.1 release

[#2854] Added ChangeLog entry

[#2854] Added DHCPx_QUERY_LABEL

[#2968] added interface to subnet selection in v4 ARM

[#3001] fixed references to hooks libs in ARM

[#2954] Fixed sporadic UT failure

modified /src/lib/asiolink/tests/io_service_signal_unittests.cc

[#3003] Fixed more indentation

[#3003] disabled ddns config in yang ut and fixed indentation

[#3003] Regen flex

[#3003] Removed comments

[#3003] Added output-options alias

[#2970] Regen flex

[#2970] Added cstdint include

[#2995] fixed ARM for perfdhcp -D option

[#2908] Addressed comments

[#2908] Fixed class assigned logs

[#1356] add recognizing-same-client.uml

[#1356] fix generating UML images

It was not working at all for me.
"make .uml.png -C doc/sphinx" would just open a GUI.

[#2994] bump up Kea version to 2.5.1-git

[#2991] release changes

[#2990] bump up library versions for 2.5.0 release

[#2988] doc -version error fix

[#2876] Addressed comments

[#2876] Fixed m4macros Makefile

[#2876] Added ChangeLog entry

[#2876] Changed to C++ 14

[#2792] Removed unused function

[#2792] Added ChangeLog for #2792

[#2792] Check that mysql pointer is non-null

This is a workaround for the libmysqlclient that dereferences mysql ptr
in the MYSQL_STMT after reconnect. Kea checks that this pointer is not
NULL before using the statement.

[#2906] Added a fix for Jenkins

[#2934] fix ignoring of native-pkg parameter

[#2934] fix ignoring of native-pkg parameter

[#2870] Intergrated #2971 fix

[#2869] Removed duplicated comment

[#2869] Finished delete cascade

[#2869] Checkpoint add delete cascade

[#2869] Rewrote get by relay/remote in one query

[#2869] Moved to inet in PostgreSQL

[#2869] Finished test factoring

[#2869] Checkpoint: factoring UTs

[#2869] Addressed some comments

[#2869] After rebase fixes

[#2869] Added a ChangeLog entry

[#2869] Finished tests

[#2869] Checkpoint: adding tests

[#2869] Updated doc

[#2869] Improved reclaimed handling

[#2869] Added extended-info6-upgrade

[#2869] Updated v6 status-get

[#2869] Checkpoint: fixed MySQL

[#2869] Checkpoint: start new UTs

[#2869] Revamped set/getExtendedInfoTablesEnabled

[#2869] Implemented getByR*Id6

[#2869] Add getExtendedInfo6Common

[#2869] Implemented other not get ops

[#2869] Implemented new deletes

[#2869] Implemented wipeExtendedInfoTables6

[#2869] Added count statements

[#2869] Checkpoint: made buildExtendedInfoTables6 memfile only

[#2869] Checkpoint: added statements

[#2276] Upgrade global param values in DB

Convert ddns-use-conflict-resolution to
ddns-conflict-resolution-mode in DB

configure.ac
    Added new upgrade files

src/bin/admin/tests/mysql_tests.sh.in
src/bin/admin/tests/pgsql_tests.sh.in
    new upgrade tests

src/lib/mysql/mysql_constants.h
src/lib/pgsql/pgsql_connection.h
    update schema version

src/share/database/scripts/mysql/.gitignore
src/share/database/scripts/mysql/Makefile.am
src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
    new upgrade script

src/share/database/scripts/mysql/dhcpdb_create.mysql
    added conversion logic to stay in sync with upgrade script

src/share/database/scripts/pgsql/Makefile.am
src/share/database/scripts/pgsql/.gitignore
src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
    new upgrade script

src/share/database/scripts/pgsql/dhcpdb_create.pgsql
    added conversion logic to stay in sync with upgrade script

[#2276] Post rebase fixes

[#2276] Addressed review comments

[#2276] Added ChangeLog entry

[#2276] Add TIMEOUT log messages to new classes

/src/bin/d2/check_exists_add.cc
/src/bin/d2/check_exists_remove.cc
/src/bin/d2/simple_add_without_dhcid.cc
/src/bin/d2/simple_remove_without_dhcid.cc

[#2276] Upgrade DB schemas

Schema upgrade converts CB global parameter ddns-use-conflict-resolution
entries to ddns-conflict-resolution-mode

configure.ac
    Added db upgrade files

/src/bin/admin/tests/mysql_tests.sh.in
/src/bin/admin/tests/pgsql_tests.sh.in
    updated tests

/src/lib/mysql/mysql_constants.h
/src/lib/pgsql/pgsql_connection.h
    updated schema version

/src/share/database/scripts/mysql/.gitignore
/src/share/database/scripts/mysql/Makefile.am
/src/share/database/scripts/mysql/dhcpdb_create.mysql
    upgrade to 19

/src/share/database/scripts/pgsql/.gitignore
/src/share/database/scripts/pgsql/Makefile.am
/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
    upgrade to 18

[#2276] Updated the ARM

modified:
    doc/sphinx/arm/dhcp4-srv.rst
    doc/sphinx/arm/dhcp6-srv.rst

[#2276]  clean up

/doc/examples/kea4/all-keys.json
/doc/examples/kea6/all-keys.json
    Commented out ddns-use-conflict-resolution
    Added ddns-conflict-resolution-mode

/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
    Translates ddns-use-conflict-resolution
    to ddns-conflict-resolution-mode

/src/lib/dhcpsrv/cfg_globals.cc
/src/lib/dhcpsrv/cfg_globals.h
    Removed ddns-use-conflict-resolution

/src/lib/dhcpsrv/parsers/simple_parser4.cc
/src/lib/dhcpsrv/parsers/simple_parser6.cc
    removed ddns-use-conflict-resolution

[#2276} Fix typo in location.hh

modified:   src/bin/dhcp4/location.hh

[#2276] Initial impl ddns-resolution-conflict-mode

New Files:
src/bin/d2/check_exists_add.cc
src/bin/d2/check_exists_add.h
src/bin/d2/check_exists_remove.cc
src/bin/d2/check_exists_remove.h
src/bin/d2/simple_add_without_dhcid.cc
src/bin/d2/simple_add_without_dhcid.h
src/bin/d2/simple_remove_without_dhcid.cc
src/bin/d2/simple_remove_without_dhcid.h

src/bin/d2/tests/check_exists_add_unittests.cc
src/bin/d2/tests/check_exists_remove_unittests.cc
src/bin/d2/tests/simple_add_without_dhcid_unittests.cc
src/bin/d2/tests/simple_remove_without_dhcid_unittests.cc

Modified:
doc/examples/kea4/all-keys.json
doc/examples/kea4/with-ddns.json
doc/examples/kea6/all-keys.json
doc/examples/kea6/with-ddns.json

src/bin/d2/Makefile.am
src/bin/d2/check_exists_add.cc
src/bin/d2/check_exists_add.h
src/bin/d2/check_exists_remove.cc
src/bin/d2/check_exists_remove.h
src/bin/d2/d2_update_mgr.cc
src/bin/d2/simple_add_without_dhcid.cc
src/bin/d2/simple_add_without_dhcid.h
src/bin/d2/simple_remove_without_dhcid.cc
src/bin/d2/simple_remove_without_dhcid.h
src/bin/d2/tests/Makefile.am
src/bin/d2/tests/check_exists_add_unittests.cc
src/bin/d2/tests/check_exists_remove_unittests.cc
src/bin/d2/tests/d2_process_unittests.cc
src/bin/d2/tests/d2_queue_mgr_unittests.cc
src/bin/d2/tests/d2_update_mgr_unittests.cc
src/bin/d2/tests/nc_add_unittests.cc
src/bin/d2/tests/nc_remove_unittests.cc
src/bin/d2/tests/simple_add_unittests.cc
src/bin/d2/tests/simple_add_without_dhcid_unittests.cc
src/bin/d2/tests/simple_remove_unittests.cc
src/bin/d2/tests/simple_remove_without_dhcid_unittests.cc

    src/bin/dhcp4/dhcp4_lexer.cc
    src/bin/dhcp4/dhcp4_lexer.ll
src/bin/dhcp4/dhcp4_parser.cc
src/bin/dhcp4/dhcp4_parser.h
src/bin/dhcp4/dhcp4_parser.yy
src/bin/dhcp4/json_config_parser.cc
src/bin/dhcp4/location.hh
src/bin/dhcp4/parser_context.h
src/bin/dhcp4/tests/config_parser_unittest.cc
src/bin/dhcp4/tests/d2_unittest.cc
src/bin/dhcp4/tests/fqdn_unittest.cc
src/bin/dhcp4/tests/get_config_unittest.cc

src/bin/dhcp6/dhcp6_lexer.cc
src/bin/dhcp6/dhcp6_lexer.ll
src/bin/dhcp6/dhcp6_parser.cc
src/bin/dhcp6/dhcp6_parser.h
src/bin/dhcp6/dhcp6_parser.yy
src/bin/dhcp6/dhcp6_srv.cc
src/bin/dhcp6/json_config_parser.cc
src/bin/dhcp6/location.hh
src/bin/dhcp6/parser_context.h
src/bin/dhcp6/tests/config_parser_unittest.cc
src/bin/dhcp6/tests/d2_unittest.cc
src/bin/dhcp6/tests/fqdn_unittest.cc
src/bin/dhcp6/tests/get_config_unittest.cc

src/lib/d2srv/testutils/nc_test_utils.cc
src/lib/d2srv/testutils/nc_test_utils.h

src/lib/dhcp_ddns/ncr_msg.cc
src/lib/dhcp_ddns/ncr_msg.h
src/lib/dhcp_ddns/tests/ncr_udp_unittests.cc
src/lib/dhcp_ddns/tests/ncr_unittests.cc

src/lib/dhcpsrv/cfg_globals.cc
src/lib/dhcpsrv/cfg_globals.h
src/lib/dhcpsrv/ncr_generator.cc
src/lib/dhcpsrv/network.cc
src/lib/dhcpsrv/network.h
src/lib/dhcpsrv/parsers/base_network_parser.cc
src/lib/dhcpsrv/parsers/base_network_parser.h
src/lib/dhcpsrv/parsers/simple_parser4.cc
src/lib/dhcpsrv/parsers/simple_parser6.cc
src/lib/dhcpsrv/srv_config.cc
src/lib/dhcpsrv/srv_config.h
src/lib/dhcpsrv/tests/d2_udp_unittest.cc
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
src/lib/dhcpsrv/tests/ncr_generator_unittest.cc
src/lib/dhcpsrv/tests/network_unittest.cc
src/lib/dhcpsrv/tests/srv_config_unittest.cc