Revert "SERVER-16059 Fix integer truncation issues with timeouts"

This reverts commit 1a81817c9e82d421c52ea575a29dd16168902800.
Revert "Don't log on first pass through lock wait loop"

This reverts commit 04869a65202864514e6066ef77798a39c7c4920d.
Revert "Don't check the time more than needed when locking"

This reverts commit 7e2937e75e84c8cb27a22488a202cf4411977c6a.
Merge remote-tracking branch 'upstream/master'