FreeNAS Code

Update the tool tips just to make it ABSOLUTELY clear that one should be putting
in their FreeNAS server's hostname, NOT an AD server name.

This will hopefully finally put this issue to rest, before we finally get sane and use a single hostname for the whole freaking system, like we should have been doing from day 1.

This will resolve the bikeshed in ticket 959 and elsewhere.

Merge branch 'gitvolumes'

The time has come!
We still need to test upgrades from previous trunk, probably a few minor tweaks are to come

Conflicts:
gui/account/forms.py
gui/middleware/notifier.py
gui/services/forms.py
gui/storage/evilhack.py
gui/storage/urls.py
gui/templates/storage/dataset_confirm_delete.html
gui/templates/storage/dataset_edit.html
gui/templates/storage/datasets.html
gui/templates/storage/disk_detach.html
gui/templates/storage/geom_disk_replace.html
gui/templates/storage/permission.html
gui/templates/storage/scrub_confirm.html
gui/templates/storage/volumes.html
gui/templates/storage/zpool_status.html
gui/templates/storage/zvols.html
nanobsd/Files/usr/local/bin/custom-upssched-cmd
nanobsd/common

fix UPS ports, last changeset would rule out usb devs

sanitize ups_identifier

remember the custom UPS port

Don't present the .init and .lock devices to the end user in the UPS configuration pane (this can be easily determined by looking for a '.' in the filename).

Revert "ftp filemask should use 0o777 for bitwise AND instead of 0o666 (vice-versa for dirmask)"

This reverts commit 42eadb9759e6425a8f7bc651f9873ff9f878d4e6.

ftp filemask should use 0o777 for bitwise AND instead of 0o666 (vice-versa for dirmask)

Make the number of connections passed to afpd tunable.

This addresses ticket 847.

- Consolidate imports.
- Remove unused imports.
- Use os.unlink instead of os.system('rm ...')