Merge branch 'xfs-bug-fixes-for-3.15-2' into for-next