Merge "Revert "rdbms: codify DatabaseDomain table "_" prefix convention""