s3:modules fix Bug 8330 NFSv4 ACL merging logic is broken