SERVER-14462 Make db.currentOp report currently held locks from Lock Manager
Merge remote-tracking branch 'upstream/master'