Fix already defined variable warning
Merge branch 'scabrero/samba-fix-nt-status-object-name-not-found' into scabrero/samba-fix-tests

Conflicts:
	main/samba/ChangeLog
Set zavsd socket mode to 0777
Release samba 4.1.0rc4-zentyal2
Merge branch '3.2' into scabrero/samba-fix-tests

Conflicts:
	main/samba/ChangeLog
Merge pull request #703 from Zentyal/scabrero/samba-fix-tests

Scabrero/samba fix tests