Merge tag 'samba-4.2.11' into v4-2-test