Merge pull request #1001 from jmaas/release26

Minor improvement to LDAP configuration, fixes #217
Fix Makefile for Cobbler 2.6.x as suggested in #555