SERVER-14462 Make db.currentOp report currently held locks from Lock Manager
SERVER-15932 Fix build break of rocks storage engine

Signed-off-by: Ramon Fernandez <ramon.fernandez@mongodb.com>
SERVER-14425: fix WriteConflictException handling in multi-update
SERVER-14860: fix multi-index build transactionality around setIndexIsMultikey
Merge remote-tracking branch 'nextdoor/master'
missing ident is 0 sized