Merge abc82fc into 60ca660

Author: bdoyle0182

core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerProxy.scala

@@ -611,7 +611,12 @@ class FunctionPullingContainerProxy(
       if (runningActivations.isEmpty) {
         logging.info(this, s"The Client closed in state: $stateName, action: ${data.action}")
         // Stop ContainerProxy(ActivationClientProxy will stop also when send ClientClosed to ContainerProxy).
-        cleanUp(data.container, None, false)
+        cleanUp(
+          data.container,
+          data.invocationNamespace,
+          data.action.fullyQualifiedName(withVersion = true),
+          data.action.rev,
+          None)
       } else {
         logging.info(
           this,

tests/src/test/scala/org/apache/openwhisk/core/containerpool/v2/test/FunctionPullingContainerProxyTests.scala

@@ -961,7 +961,7 @@ class FunctionPullingContainerProxyTests
     }
     client.send(machine, ClientClosed)
 
-    probe.expectMsgAllOf(ContainerRemoved(false), Transition(machine, Running, Removing))
+    probe.expectMsgAllOf(ContainerRemoved(true), Transition(machine, Running, Removing))
 
     awaitAssert {
       factory.calls should have size 1
@@ -1614,7 +1614,7 @@ class FunctionPullingContainerProxyTests
     client.expectMsg(GracefulShutdown)
     client.send(machine, ClientClosed)
 
-    probe.expectMsgAllOf(ContainerRemoved(false), Transition(machine, Running, Removing))
+    probe.expectMsgAllOf(ContainerRemoved(true), Transition(machine, Running, Removing))
 
     awaitAssert {
       factory.calls should have size 1