Improve GPO models preconditions
Merge branch '3.2' into scabrero/fix-samba-ldap

Conflicts:
	main/samba/ChangeLog
Release samba 4.1.0-zentyal5
fixed indentation
Merge pull request #754 from Zentyal/scabrero/fix-samba-ldap

Scabrero/fix samba ldap