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