Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.Prune svn:mergeinfo from the new branch, as nothing has been mergedhere.Additional commits post-branch will follow.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Fix merge conflicts, and because this still has a zillion warnings,protect the build with a WARNS=2.Fix the build.
Bring files back from the dead prior to remote commit to fix importconflicts.