Merge pull request #1072 from jmaas/release24

Cobbler release 2.4.6