Merge pull request #1149 from jmaas/release26

Cobbler release 2.6.4