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

Believe it or nor not this actually was a ticket.

Ticket: #6267
Allow changing home directory name for existing users

Ticket: #4985
Extra debugging

Ticket: #5047
Ticket #6281

Don't wait for USB detachment.  This may bite us
later, but it is how 9.2 behaved.
Merge remote-tracking branch 'origin/master' into freebsd10