Fix more compilation errors/warnings on stable/10

Sponsored by: EMC / Isilon Storage Division
Fix linker issues on stable/10

Sponsored by: EMC / Isilon Storage Division
Merge branch 'isilon-atf-integrate-dtrace' of https://github.com/yaneurabeya/freebsd into isilon-atf-integrate-dtrace