Merge branch 'xfs-4.7-misc-fixes' into for-next