SERVER-13635 Fix kv_engine_test_harness.cpp

Fixes build break introduced in 49837594e7c52e2426d6b08dfa8131b4b3590e40
SERVER-15604 log component kControl
Merge remote-tracking branch 'upstream/master'