Rewrite based on current auto-categorization.  And improve based
on how create_package does the job.
Merge branch '93M2-DEMO' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas into 93M2-DEMO
grub doesn't like going through GEOM.