Merge of master-melb:xfs-cmds:24327a by kenmcd.
Merge of master-melb:xfs-cmds:21690a by kenmcd. acl and exec perms test