Merge "Clarify IDatabase docs for upsert() and replace()"