Merge commit '624175a' into merge-3.5-main-20240322

Conflicts:
	cmd/juju/commands/upgradecontroller.go
	cmd/juju/commands/upgradecontroller_test.go
	cmd/juju/commands/upgrademodel.go
	cmd/juju/commands/upgrademodel_test.go

Author: hpidcock

cmd/juju/commands/main.go

@@ -398,7 +398,7 @@ func registerCommands(r commandRegistry) {
 	r.Register(model.NewModelGetConstraintsCommand())
 	r.Register(model.NewModelSetConstraintsCommand())
 	r.Register(newSyncAgentBinaryCommand())
-	r.Register(newUpgradeJujuCommand())
+	r.Register(newUpgradeModelCommand())
 	r.Register(newUpgradeControllerCommand())
 	r.Register(application.NewRefreshCommand())
 	r.Register(application.NewSetApplicationBaseCommand())