s4sync: Check samba daemon is running
Merge branch '3.3' into scabrero/samba-s4sync-check-samba-running

Conflicts:
	main/samba/ChangeLog
Merge branch 'scabrero/samba-s4sync-check-samba-running' into 3.3

Conflicts:
	main/samba/ChangeLog