add auto-discover of the ldap servers
add missing dnspython
Merge remote-tracking branch 'origin/feature/ldap-auto-discover'
Merge branch 'master' into feature/south

Conflicts:
	REQUIREMENTS