Consuming hybrid concurrent upsert tests
Merge pull request #728 from khawkins/hybrid_concurrent_upsert_tests

Consuming hybrid concurrent upsert tests