A couple of bug fixes related to updating.
Merge branch '93M1-DEMO' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas into 93M1-DEMO