Synch final version which will be committed to svn..
Merge branch 'isilon-atf' of https://github.com/yaneurabeya/freebsd into isilon-atf