don't log deadlock retry twice
SERVER-16076: make sure we restart txn when unlocking
SERVER-16076: convert deadlock to dup key exception in unique key violation
Merge remote-tracking branch 'upstream/master'