Merge pull request #961 from jmaas/release26

Cobbler release 2.6.1