Re-enable TODOs
Add XXX comments to remind me that these need to be fixed
Merge branch 'isilon-atf' of https://github.com/yaneurabeya/freebsd into isilon-atf