Fix the build due to merge conflicts I missed before
Merge branch 'isilon-atf' of https://github.com/yaneurabeya/freebsd into isilon-atf