Merge pull request #855 from jmaas/master

PEP8 - cobbler/cobblerd.py