Merge branch 'trac1226' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1226

Conflicts:
	src/lib/dhcp/tests/pkt4_unittest.cc