MFC r236145, r236146:

MFC r236145, r236146:

MFC r236145 [1]:
Import illumos changeset 13564:cf89c0c60496
1946 incorrect formatting when listing output of multiple pools with
zpool iostat -v

MFC r236146 [2]:
Import illumos changeset 13605:b5c2b5db80d6 (partial)
763 FMD msg URLs should refer to something visible
Replace sun.com URL's with illumos.org

References:
https://www.illumos.org/issues/1946 [1]
https://www.illumos.org/issues/763 [2]

Obtained from:	illumos (issue #1946 [1], #763 [2])

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