Merge branch 'xfs-misc-fixes-4.6-4' into for-next