SERVER-13635 Fix kv_engine_test_harness.cpp

Fixes build break introduced in 49837594e7c52e2426d6b08dfa8131b4b3590e40
SERVER-15604 log component kControl
Fix build after upstream merge
Merge branch 'master' of https://github.com/mongodb/mongo into kv_dictionary
Merge branch 'kv_dictionary' of github.com:esmet/mongo into tokuft
TokuFT: Move supportsDocLocking to the KVEngineImpl subclass instead of
the KVStorageEngine subclass
KVRecordStore: use WriteUnitOfWorks when dealing with metadata dict
KVSortedDataImpl: added WriteUnitOfWork around builder

This probably means the c++ tests are broken though?
Merge branch 'kv_dictionary' into tokuft