Merge r276153-r276362 from HEAD

This is a mergeinfo change only, prompted by Subversion's complaint
that "revisions 276153 through 276362 were [not] previously merged from
svn+ssh://svn.freebsd.org/base/head"