Merge pull request #807 from jmaas/release26

Release Cobbler 2.6.0