Fix a logic bug.  Also fix the options.
Merge branch 'master' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas

Conflicts:
	src/freenas-pkgtools/freenas-release/freenas-release.py