Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.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.