Merge pull request #1164 from jmaas/release26

Cobbler release 2.6.5