SERVER-13635 disallow NULL entries in KVDatabaseCatalogEntry::_collections
Revert "SERVER-14462 Make db.currentOp report the currently held locks from the Lock Manager"

This reverts commit 1ae3facefbfdb05d3369576611eb96fb1a303815.
Merge remote-tracking branch 'root/master'