Merge branch 'xfs-4.10-misc-fixes-3' into for-next