SERVER 14425: DeadLock exception class and beginnings of automatic retry
SERVER-15718 fix error code for count
Merge remote-tracking branch 'upstream/master'