Merge commit 'samba/v3-2-test' into v3-2-stable