Merge branch 'master' into proto-files

# Conflicts:
#	go.mod
#	go.sum
#	pkg/admin/admin.go
#	pkg/admin/api/config.go
#	pkg/auth/api/config.go
#	pkg/auth/auth.go
#	pkg/management/api/config.go
#	pkg/management/management.go

pkg/management/api/config.go

@@ -0,0 +1,7 @@
+package api
+
+import "github.com/caos/zitadel/internal/api/grpc"
+
+type Config struct {
+	GRPC grpc.Config
+}