Add fixes for when usersuffix and groupsuffix are blank.
Merge branch 'master' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas