Merge pull request #1038 from jmaas/release26

Cobbler release 2.6.2
Merge branch 'release26' of github.com:jmaas/cobbler into release26
Merge pull request #1039 from jmaas/release26

Release26