Merge branch 'isc-master'

diff --cc AUTHORS
index 3df5202ca1fc35e688db7cd5138b0414eb57f7da,da3170ad42c9381980734f79f9901c4844092c2c..3f78036192addc5a35335ffafd1417eaf610236c
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -97,12 -97,9 +97,15 @@@ We have received the following contribu
   - Angelo Failla, Facebook
     2016-04: Fixes for transaction id generation in perfdhcp
  
+  - Razvan Becheriu, Qualitance
+    2016-05: Added support for Cassandra
+ 
 + - Cristian Secareanu, Qualitance
 +   2016-06: Added support for IPv6 prefix and PDEXCLUDE option
 +
 + - Andrei Pavel, Qualitance
 +   2016-06: [RFCs 6334, 6603, 7598] Additional native option support
 +
  Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
  Boost (http://www.boost.org/) library for almost everything, and can use Botan
  (http://botan.randombit.net/) or OpenSSL (https://www.openssl.org/) for

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

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

diff --cc src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
Simple merge