Merge r8826:r10238
Merge r8623:8824 from trunk into the CLI branch.
Merge changes from trunk (r8588:r8621).
Merge changes (8576:8587) from trunk to the cli project.
Merge changes from trunk (8219:8527) to cli project.
freenas8-plugins -> cli.