Merge pull request #1075 from jmaas/release26

cobbler-web improvements