Merge remote-tracking branch 'upstream/pr/3782' into 3.x
- upstream/pr/3782: (PUP-3388) Differentiate between single and multi mirror and raidz pools (PUP-3388) Add tests for creating mirror and raidz virtual devices Revert "(#16157) ensure that mirror and raidz are used as subcommands"