Merge pull request #1128 from jmaas/master

More cleanup work
Merge branch 'master' of https://github.com/cobbler/cobbler
Merge pull request #1129 from jmaas/master

More cleanup work
Merge branch 'master' of https://github.com/cobbler/cobbler