MFC r322770, r322796:

MFC r322770, r322796:

 r322770:
  Apply changes from bin/chmod/tests/chmod_test.sh, adding
  atf_expect_fail() before chflags(8) is invoked if the filesystem
  is ZFS, which does not support UF_IMMUTABLE.

 r322796:
  Revert part of r322770 in usr.sbin/chown/tests/chown_test.sh,
  which incorrectly adds atf_expect_fail() where there is no
  failure case.

Approved by:	re (marius)
Sponsored by:	The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/stable/10@322835 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f