dns name cleanup
ldap support
Merge remote-tracking branch 'upstream/master'