Merge pull request #12630 from hashicorp/backport/main/curiously-clever-sunbird

This pull request was automerged via backport-assistant

command/agent/config.go

@@ -1604,6 +1604,9 @@ func (a *ClientConfig) Merge(b *ClientConfig) *ClientConfig {
 	} else if b.Reserved != nil {
 		result.Reserved = result.Reserved.Merge(b.Reserved)
 	}
+	if b.ReserveableCores != "" {
+		result.ReserveableCores = b.ReserveableCores
+	}
 	if b.GCInterval != 0 {
 		result.GCInterval = b.GCInterval
 	}