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

Conflicts:
	src/lib/dns/gen-rdatacode.py.in