Applied to xenial/master-next branch. Skipped commit 1e626147b4b5 (CIFS: Fix maximum SMB2 header size) since it had been already applied as a fix for LP: #1713884 ([CIFS] Fix maximum SMB2 header size).