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