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