Merge pull request #902 from jmaas/master

PEP8 - cobbler/action_power.py
Merge pull request #903 from jmaas/master

More pyflakes fixes