modified:
doc/examples/kea4/all-keys.json
doc/examples/kea6/all-keys.json
doc/sphinx/arm/dhcp4-srv.rst
doc/sphinx/arm/dhcp6-srv.rst

src/bin/dhcp4/tests/config_parser_unittest.cc
    TEST_F(Dhcp4ParserTest, storeExtendedInfoNoGlobal)
    TEST_F(Dhcp4ParserTest, storeExtendedInfoGlobal) - new tests

src/bin/dhcp4/tests/dora_unittest.cc
    TEST_F(DORATest, storeExtendedInfoEnabled)
    TEST_F(DORATest, storeExtendedInfoDisabled) - new tests

src/bin/dhcp4/tests/get_config_unittest.cc
    updated unit tests

src/bin/dhcp6/dhcp6_lexer.ll
src/bin/dhcp6/dhcp6_parser.yy
src/bin/dhcp6/json_config_parser.cc
    added support for store-extended-info

src/bin/dhcp6/tests/get_config_unittest.cc
    updated unit tests

src/bin/dhcp6/tests/config_parser_unittest.cc
    TEST_F(Dhcp6ParserTest, storeExtendedInfoGlobal)
    TEST_F(Dhcp6ParserTest, storeExtendedInfoNoGlobal) - new tests

src/lib/dhcpsrv/alloc_engine.*
    AllocEngine::reuseExpiredLease()
    AllocEngine::createLease6()
    AllocEngine::extendLease6() - added call to AllocEngine::updateLase6ExtendedInfo()

    AllocEngine::updateLease4ExtendedInfo() - create Elements directly

    AllocEngine::updateLease6ExtendedInfo() - new method

src/lib/dhcpsrv/tests/alloc_engine6_unittest.cc
    TEST_F(AllocEngine6ExtendedInfoTest, updateExtendedInfo6)
    TEST_F(AllocEngine6ExtendedInfoTest, storeExtendedInfoEnabled6)
    TEST_F(AllocEngine6ExtendedInfoTest, storeExtendedInfoDisabled6)
    TEST_F(AllocEngine6ExtendedInfoTest, reuseExpiredLease6)
    - new tests

src/lib/dhcpsrv/parsers/dhcp_parsers.cc
src/lib/dhcpsrv/parsers/shared_network_parser.cc
src/lib/dhcpsrv/parsers/base_network_parser.*
    Renamed BaseNetworkParser::parseCommonTimer() to parseCommon() and
    added handling of store-extended-info.

src/lib/dhcpsrv/parsers/simple_parser6.cc
    Added store-extended-info

src/lib/dhcpsrv/tests/cfg_shared_networks6_unittest.cc
src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
src/lib/dhcpsrv/tests/network_unittest.cc
src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc
    updated tests

modified:
    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/position.hh
	src/bin/dhcp4/stack.hh
	src/bin/dhcp4/tests/get_config_unittest.cc

src/lib/dhcpsrv/alloc_engine.cc
    AllocEngine::updateLease4ExtendedInfo()
    - added check of store-extended-info

src/lib/dhcpsrv/network.*
src/lib/dhcpsrv/parsers/simple_parser4.cc
    added parameter for store-extended-info

src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc
src/lib/dhcpsrv/tests/cfg_shared_networks4_unittest.cc
src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
src/lib/dhcpsrv/tests/network_unittest.cc
src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc

    Updated tests to include store-extended-info

src/lib/dhcpsrv/alloc_engine.*
    AllocEngine::updateLease4ExtendedInfo() - new function

    AllocEngine::createLease4()
    AllocEngine::updateLease4Info()
    - added call to updateLease4ExtendedInfo(lease, ctx);

src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc
    TEST_F(AllocEngine4Test, updateExtendedInfo4)
    TEST_F(AllocEngine4Test, storeExtendedInfoEnabled4)
    TEST_F(AllocEngine4Test, storeExtendedInfoDisabled4)

src/lib/dhcpsrv/tests/alloc_engine_utils.h
    NakeAllocEngine::callUpdateLease4ExtendedInfo4()