Fix logical condition which was breaking useradd.
Merge pull request #7899 from cachedout/develop

Fix logical condition which was breaking useradd.
pylint fix for fileserver routine
Merge branch 'develop' into with-pylint-pragmas