Access denied for both anonymous & authenticated users when using ACB with Domain Access and Content Access modules

When using the Content Access module in combination with the Domain Access module, the ACB module is returning access denied for everyone. This is due to the fact that the node grants in Content Access are suffixed with _roles instead of _rid (which is checked for in the ACB module). Also, the rids of the roles seem incorrect.