more sync with trunk

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac268@2674 e5f2f494-b856-4b98-b285-d166d9295462