Merge branch 'atf' of https://github.com/yaneurabeya/freebsd into atf
Merge branch 'atf' into isilon-atf