Merge remote-tracking branch 'origin/trac4110' into hackathon94

diff --cc src/lib/dhcpsrv/subnet_selector.h
index b848f360bafcf1281b9ce85967444ccf42edc730,81d6687864cfebe973acec07c53450cfd2e58e42..368aa4ce9279ab0e8b8a0fe551ca19d5f77322d9
--- 1/src/lib/dhcpsrv/subnet_selector.h
--- 2/src/lib/dhcpsrv/subnet_selector.h
+++ b/src/lib/dhcpsrv/subnet_selector.h
@@@ -68,10 -68,10 +71,11 @@@ struct SubnetSelector 
            option_select_(asiolink::IOAddress("0.0.0.0")),
            interface_id_(),
            first_relay_linkaddr_(asiolink::IOAddress("::")),
+           dhcp4o6_(false),
            local_address_(asiolink::IOAddress("0.0.0.0")),
            remote_address_(asiolink::IOAddress("0.0.0.0")),
 -          client_classes_(), iface_name_(std::string()) {
 +          client_classes_(), iface_name_(std::string()),
 +          dhcp4o6_(false) {
      }
  };