[master] Merge branch 'trac5457'

# Conflicts:
#	src/bin/dhcp4/tests/callout_library_1.cc
#	src/bin/dhcp4/tests/callout_library_2.cc

diff --cc src/bin/dhcp4/ctrl_dhcp4_srv.cc
Simple merge

diff --cc src/bin/dhcp4/dhcp4_messages.mes
Simple merge

diff --cc src/bin/dhcp4/dhcp4_srv.cc
Simple merge

diff --cc src/bin/dhcp4/dhcp4_srv.h
Simple merge

diff --cc src/bin/dhcp4/dhcp4to6_ipc.cc
Simple merge

diff --cc src/bin/dhcp4/tests/callout_library_1.cc
index 866652c6f6b2cdd8c7a91e9f80d0fa492b2ec02d,af66942ae95f5f3758c0c27d484506080da0e3cc..f5278dd970aff4bea985a60438bd5d9f1d999a37
--- 1/src/bin/dhcp4/tests/callout_library_1.cc
--- 2/src/bin/dhcp4/tests/callout_library_1.cc
+++ b/src/bin/dhcp4/tests/callout_library_1.cc
@@@ -11,6 -11,4 +11,6 @@@
  /// tests.  See callout_common.cc for details.
  
  static const int LIBRARY_NUMBER = 1;
- #include "callout_library_common.h"
 +#include <config.h>
+ #include <dhcp4/tests/callout_library_common.h>
 +

diff --cc src/bin/dhcp4/tests/callout_library_2.cc
index ae417a29697419429eb60c7790db85628be5277b,8135e2b1cd8ffe83194c06dad7d6a59d2159dc1d..df4fdcdc442af86e6bec0c3ec668fc3f58f1da47
--- 1/src/bin/dhcp4/tests/callout_library_2.cc
--- 2/src/bin/dhcp4/tests/callout_library_2.cc
+++ b/src/bin/dhcp4/tests/callout_library_2.cc
@@@ -11,6 -11,4 +11,6 @@@
  /// tests.  See callout_common.cc for details.
  
  static const int LIBRARY_NUMBER = 2;
- #include "callout_library_common.h"
 +#include <config.h>
+ #include <dhcp4/tests/callout_library_common.h>
 +

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

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

diff --cc src/lib/hooks/callout_handle.cc
Simple merge

diff --cc src/lib/hooks/hooks_manager.cc
Simple merge

diff --cc src/lib/hooks/server_hooks.cc
Simple merge

diff --cc src/lib/hooks/tests/Makefile.am
Simple merge

diff --cc src/lib/hooks/tests/handles_unittest.cc
Simple merge

diff --cc src/lib/hooks/tests/hooks_manager_unittest.cc
Simple merge

diff --cc src/lib/hooks/tests/server_hooks_unittest.cc
Simple merge