Merge tag 'samba-4.0.4' into v4-0-test