HomeFreeBSD

Merge ^/head r357368 through r357388.