Merge pull request #836 from jmaas/master

PEP8 - bin/cobblerd