Excuse no wait for a move from a build not known, and count a module put back only once there is one (hq issue 318 review)

cmd/mesh-controller/release.go

@@ -414,7 +414,6 @@ func putBackBroken(ctx context.Context, open *stores, p *inventory.Plan, g *inve
 	batched, back := batchingRollbacks(ctx)
 	var said []string
 	for _, m := range todo {
-		g.Returned = append(g.Returned, m)
 		machines := g.Machines
 		var state *inventory.PlanModule
 		if m == lead && leadState != nil {
@@ -434,6 +433,8 @@ func putBackBroken(ctx context.Context, open *stores, p *inventory.Plan, g *inve
 				machines = []string{c.Node}
 			}
 		}
+		// Counted as put back only once there is something to put back (a carried move or the plan's own).
+		g.Returned = append(g.Returned, m)
 		p.Note = ""
 		gateFailed(batched, open, p, m, state, machines, g.BrokenWhy)
 		if m == lead && leadState != nil {