Merge of master-melb:xfs-cmds:29701a by kenmcd. Update args to use command options for multi_open_unlink. Change a sleep to a wait as we were just sleeping to account for the death of a process - should really wait for its death.