Merge pull request #897 from jmaas/master

PEP8 - cobbler/cli.py