Merge branch 'release26' of https://github.com/cobbler/cobbler into release26

Conflicts:
	cobbler.spec
	setup.py
Merge branch 'release26' of https://github.com/cobbler/cobbler into release26

Conflicts:
	cobbler.spec
Merge pull request #798 from jmaas/release26

Fix merge error