Record property-level merge conflicts in DLQ

[bobvawter]

If we're adding an entry to a DLQ table due to a merge conflict, we should add an extra JSON blob containing the before/after/target values for each conflicting property (we don't record a snapshot of the target row at this time). This would improve debugging and let downstream consumers of the DLQ know exactly which properties need to be handled.