Merge pull request #634 from jmaas/master

Koan and specfile fixes
Issue #510 - better concurrency in cobbler
Issue #510 - There were some new collection classes I missed the first time
Merge pull request #635 from sdherr/sherr-issue-510

Sherr issue 510
Merge pull request #636 from jmaas/master

Fix #608 again.