more sync trunk (not sure if I need to do this again, but reintegrate didn't succeed)

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