Avoid defunct registry/notary processes during tests Upstream-commit: ead8ce2431988170b8c89dbd8053d1824e9a919d Component: engine