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

Conflicts:
	src/lib/dns/tests/rdata_dhcid_unittest.cc