Merge "Add test for swift ACLs"