Merge of master-melb:xfs-cmds:31348a by kenmcd. Do CI stat/create/unlink test for multiple directory forms