Issue #276: Optimize db_merge() to use one fewer query on updates.
Issue #276: Remove unused implementation of separate conditionTable from MergeQuery class.
Merge pull request #370 from quicksketch/276/optimize_db_merge

Issue #276: Optimize db_merge() to use one fewer query on updates.