Merge of master-melb:xfs-cmds:29726a by kenmcd. Don't delete test files if they are corrupt.
Merge of master-melb:xfs-cmds:27632a by kenmcd. Fix test number and simplify test case