EUCA-7063, syncing up walrus behavior with S3 on canned ACLs, while cherry-picking, I forgot that some classes have moved