Install the additional test mtree file

Sponsored-by: EMC / Isilon Storage Division
Merge branch 'master' into atf
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tools/build/mk/OptionalObsoleteFiles.inc
Merge branch 'master' into atf

Conflicts:
	usr.sbin/nmtree/Makefile
Merge remote-tracking branch 'refs/remotes/origin/atf' into atf
Merge remote-tracking branch 'refs/remotes/origin/atf' into atf