Do not check for acl and user_xattr mount options on btrfs
Merge branch 'scabrero/samba-btrfs'

Conflicts:
	main/samba/ChangeLog