Backport the pkgng / pc-sysinstall improvements for 9.2