Merge branch 'master' of https://github.com/mongodb/mongo into kv_dictionary

Conflicts:
	src/mongo/db/storage/record_store_test_storagesize.cpp
Merge branch 'master' of https://github.com/mongodb/mongo into kv_dictionary
Fix build, assert on op failure
Assert on fail, fix capped collections
Merge branch 'server15921' into kv_dictionary
Fix a bug where we'd use an un-seeked dictionary cursor to determine the
last entry in a record store.
Merge branch 'kv_dictionary' into tokuft

Conflicts:
	src/mongo/db/storage/kv/dictionary/kv_record_store.cpp