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

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