[master] Merge branch 'trac3688'

Conflicts:
	src/bin/dhcp4/dhcp4_srv.h

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

diff --cc src/bin/dhcp4/dhcp4_srv.h
index 6623aae5723c7539b5e43f69ba65aa60e10be56c,f0b9e4da7cacd99e8adbaeb206bd25b8b432b9d4..86e171e4470937a7685cf62de2ea7e5307bffc12
--- 1/src/bin/dhcp4/dhcp4_srv.h
--- 2/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@@ -676,11 -755,14 +755,6 @@@ private
      /// @return Option that contains netmask information
      static OptionPtr getNetmaskOption(const Subnet4Ptr& subnet);
  
-     /// @brief Allocation Engine.
-     /// Pointer to the allocation engine that we are currently using
-     /// It must be a pointer, because we will support changing engines
-     /// during normal operation (e.g. to use different allocators)
-     boost::shared_ptr<AllocEngine> alloc_engine_;
 -    /// @brief Implements the error handler for socket open failure.
 -    ///
 -    /// This callback function is installed on the @c isc::dhcp::IfaceMgr
 -    /// when IPv4 sockets are being open. When socket fails to open for
 -    /// any reason, this function is called. It simply logs the error message.
 -    ///
 -    /// @param errmsg An error message containing a cause of the failure.
 -    static void ifaceMgrSocket4ErrorHandler(const std::string& errmsg);
  
      uint16_t port_;  ///< UDP port number on which server listens.
      bool use_bcast_; ///< Should broadcast be enabled on sockets (if true).

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

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

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

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

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