[master] Merge branch 'trac3975'

diff --cc src/bin/admin/scripts/mysql/.gitignore
index e9a483d6fc92da31b9f8259f0e7f9d33a15819cb,e9a483d6fc92da31b9f8259f0e7f9d33a15819cb..3743da9a2dc080eb7bfbc183c4a03719be497bfa
--- 1/src/bin/admin/scripts/mysql/.gitignore
--- 2/src/bin/admin/scripts/mysql/.gitignore
+++ b/src/bin/admin/scripts/mysql/.gitignore
@@@ -1,2 -1,2 +1,3 @@@
  /upgrade_1.0_to_2.0.sh
  /upgrade_2.0_to_3.0.sh
++/upgrade_3.0_to_4.0.sh

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

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

diff --cc src/lib/dhcpsrv/alloc_engine.h
Simple merge

diff --cc src/lib/dhcpsrv/alloc_engine_messages.mes
Simple merge

diff --cc src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
index 655adddbb16f513a110e7aa947a9b163350643ec,e10b5d8c3ff1b08b6cb7cab0a509536bce42c56f..57a1ef324d55804d7adc4f0772ce5e830e3e1855
--- 1/src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
--- 2/src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
@@@ -1298,27 -1334,13 +1349,34 @@@ TEST_F(ExpirationAllocEngine6Test, recl
      testReclaimExpiredLeasesTimeout(1);
  }
  
- /// remove leases.
+ // This test verifies that expired-reclaimed leases are removed from the
+ // lease database.
+ TEST_F(ExpirationAllocEngine6Test, deleteExpiredReclaimedLeases) {
+     BOOST_STATIC_ASSERT(TEST_LEASES_NUM >= 10);
+     testDeleteExpiredReclaimedLeases();
+ }
+ 
 +/// This test verifies that @ref AllocEngine::reclaimExpiredLeases6 properly
 +/// handles declined leases that have expired in case when it is told to
++/// remove leases.}
 +TEST_F(ExpirationAllocEngine6Test, reclaimDeclined1) {
 +    testReclaimDeclined(true);
 +}
 +
 +/// This test verifies that @ref AllocEngine::reclaimExpiredLeases6 properly
 +/// handles declined leases that have expired in case when it is told to
 +/// not remove leases. This flag should not matter and declined expired
 +/// leases should always be removed.
 +TEST_F(ExpirationAllocEngine6Test, reclaimDeclined2) {
 +    testReclaimDeclined(false);
 +}
 +
 +/// This test verifies that statistics are modified correctly after
 +/// reclaim expired leases is called.
 +TEST_F(ExpirationAllocEngine6Test, reclaimDeclinedStats) {
 +    testReclaimDeclinedStats("assigned-nas");
 +}
 +
  // *******************************************************
  //
  // DHCPv4 lease reclamation routine tests start here!