Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next