Merge "rdbms: clean up non-native Database::replace() code"