Merge of master-melb:xfs-cmds:28940a by kenmcd. leave bad files around for post mortem on failure.
Merge of master-melb:xfs-cmds:27632a by kenmcd. Fix test number and simplify test case