Merge pull request #1038 from jmaas/release26

Cobbler release 2.6.2