Merge remote-tracking branch 'couchbase/watson'

* couchbase/watson:
  MB-21428: Make sure all tasks in fake executor pool finish execution in teardown

Change-Id: Iba28fbed2e4493a3ec250544b092356b3a980d8b

Author: daverigby

tests/module_tests/evp_store_single_threaded_test.cc

@@ -85,6 +85,8 @@ void SingleThreadedEPStoreTest::shutdownAndPurgeTasks() {
             }
         };
         runTasks(*task_executor->getLpTaskQ()[t]);
+        task_executor->stopTaskGroup(engine->getTaskable().getGID(), t,
+                                     engine->getEpStats().forceShutdown);
     }
 }
 
@@ -101,6 +103,8 @@ void SingleThreadedEPStoreTest::cancelAndPurgeTasks() {
             }
         };
         runTasks(*task_executor->getLpTaskQ()[t]);
+        task_executor->stopTaskGroup(engine->getTaskable().getGID(), t,
+                                     engine->getEpStats().forceShutdown);
     }
 }