Merge branch 'master' into atf
Merge branch 'master' into atf
Merge branch 'master' into atf
Use src.opts.mk instead of bsd.opts.mk to get MK_TESTS
Merge branch 'atf' into isilon-atf