Add missing bits svn merge did not catch


git-svn-id: svn+ssh://svn.freebsd.org/base/head@274888 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f