Tweaking and cleaning the install a bit.
Clean up some duplicated code when doing installs.
Merge branch '93M2-DEMO' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas into 93M2-DEMO