Merge pull request #956 from alanoe/alanoe/pylint_fixes

alanoe/pylint fixes
Merge branch 'master' of github.com:jmaas/cobbler
Merge pull request #965 from jmaas/master

pep8 fixes