Remove unnecessary wrappers
Merge branch 'atf' into isilon-atf