Merge commit 'samba-4.0.0rc3' into v4-0-test