Merge pull request #1074 from jmaas/release26

Cobbler release 2.6.3