Signed-off-by: Tibor Vass <teabee89@gmail.com> Conflicts: registry/registry.go registry/registry_test.go registry/service.go registry/session.go Upstream-commit: e134f1f74a9d1f9ec55fcd8af8c2dce8e9558618 Component: engine
Signed-off-by: Tibor Vass <teabee89@gmail.com> Conflicts: registry/registry.go registry/registry_test.go registry/service.go registry/session.go Upstream-commit: e134f1f74a9d1f9ec55fcd8af8c2dce8e9558618 Component: engine