Properly fix "daemon kill" on test failure Upstream-commit: 355415d823ab2738d7531676a2e6b144aa5d7452 Component: engine