@spencerkimball
spencerkimball Merge pull request #10207 from cockroachdb/spencerkimball/ambiguous-c… 
…ommit

Re-merge ambiguous commit error PR with locking fixes
Latest commit 5bc7bf1 Oct 26, 2016