Port DAV groupMemberSet fix to master #4458