Re-ordering of imports in cobbler/collection_distros.py.
A bit more refactoring work.
Merge pull request #1129 from jmaas/master

More cleanup work