Merge tag '4.21-smb3-small-fixes' of git://git.samba.org/sfrench/cifs-2.6