Backup/restore s4sync timestamp
Merge branch 'scabrero/samba-backup-s4sync-ts' into 3.2

Conflicts:
	main/samba/ChangeLog