Merge pull request #1122 from jmaas/master

PEP8: cobbler/item_distro.py:154:43: W291 trailing whitespace
Merge pull request #1123 from jmaas/master

More cleanup work
Merge pull request #1124 from jmaas/master

Change import module in item*.py.