Fix samba LDAP connect error when samba is installed but disabled
Merge branch 'scabrero/users-fix-manage' into 3.2

Conflicts:
	main/users/ChangeLog