Adding hybrid tests for concurrent upserts
Merge branch 'hybrid_upsert_tests' into hybrid_concurrent_upsert_tests
Merge pull request #205 from khawkins/hybrid_concurrent_upsert_tests

Tests to exercise concurrent upserts on the same data from hybrid