Merge pull request #1148 from jmaas/release24

Cobbler release 2.4.7