Filter out Samba specific Kerberos user accounts from the list of users
User profiles are only created if the OpenLDAP sync exists, otherwise, defer it until s4sync does the synchronization
Merge branch '3.2' into cperello/create-profile-folder-when-user-exists

Conflicts:
	main/samba/ChangeLog
	main/samba/src/EBox/LDB.pm
	main/samba/src/scripts/s4sync
Merge branch '3.2' into cperello/create-profile-folder-when-user-exists

Conflicts:
	main/samba/ChangeLog
Typo fix in netbios validation
Fix the regexp
Merge pull request #870 from Zentyal/ejhernandez/samba-typo-fix-netbios-validation

Typo fix in netbios validation
Merge pull request #871 from Zentyal/rduran/fix-regexp

Fix the regexp
Merge branch 'cperello/create-profile-folder-when-user-exists' into 3.2

Conflicts:
	main/samba/ChangeLog
Fix mail unit tests, mainly sanity check and quick recovery skipped the ones with more work to do
Fixing mailfilter tests, so we can use the Loghelper ones
Adding mailfilter to the zentyal-unit-tests script, and un-skipping loghelper tests for mailfilter
Merge pull request #872 from Zentyal/jjgarcia/fix-unit-tests

Fix unit tests
Fix warning on last inside an eval on automatic-conf-backup script

(cherry picked from commit b5f0decc1bbcaf111726a52fc69c636baa6d68d2)

Conflicts:
	main/remoteservices/ChangeLog
Merge branch '3.2' into 3.3

Conflicts:
	main/remoteservices/ChangeLog
	main/remoteservices/src/scripts/automatic-conf-backup
Print slave-sync output to zentyal.log instead of stdout
Merge pull request #873 from Zentyal/cperez/fix-userssync

Print slave-sync output to zentyal.log instead of stdout
Show confirmation dialog before upgrading to 3.3
Merge pull request #874 from Zentyal/jacalvo/upgrade-confirmation

Show confirmation dialog before upgrading to 3.3
releasing core 3.2.6