SERVER-16482 Do not look further in the conflict queue if X lock was just granted

This is a small optimization, which would help with the LM cost in the
presence of X-lock conflicts, such as the MMAP V1 collection lock.
SERVER-16429 Add ScopedTransaction to AutoGetCollectionForRead and Map-reduce
Merge remote-tracking branch 'upstream/master'