s3-smbd: Merge ACE entries based on mapped UID/GID not SID