Merge of master-melb:xfs-cmds:27794a by kenmcd. clone of test 031 using xfs_prepair instead of xfs_repair