More changes to deal with simultaneous uploads.
Merge branch 'master' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas