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.
Fix NIS

Ticket: #4955
When not in DC mode, 127.0.0.1 is okay to bind to
Grant appropriate rights for ownership to be changed on Wind0ze

Ticket: #5350
Make the usage of password prompt in install more smooth
Rename from Upgrade to Update

Ticket:	#6302
Handle MiddlewareError gracefully on manual plugin install

Ticket:	#6229
Skeleton widget for the new Updater UI

Ticket:	#6300
Auto populate initial data in the Update widget
Populate the trains select box defaulting to current train

Ticket:	#6300
Much to my surprise, that worked.  At least for a fresh install.
More changes.  It unsurprised me by not working, and then
I hit it over the head a lot.
Make the partition active.
I seem to have missed a conflict marker.
Much to my surprise, that worked.  At least for a fresh install.