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