Merge changes from trunk (r8588:r8621).
Merge 8527:8572 from trunk into the cli branch
freenas8-plugins -> cli.