Fix TestRenameStoppedContainer race Upstream-commit: 036ade6c0548d85941e8c26306ac7c27105448ea Component: engine