fix failed cherry pick (#16303)

Co-authored-by: Maliz <maliheh.monshizadeh@hashicorp.com>

agent/xds/validateupstream-test/validateupstream_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/consul/agent/xds/testcommon"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/troubleshoot/proxy"
+	troubleshoot "github.com/hashicorp/consul/troubleshoot/proxy"
 	testinf "github.com/mitchellh/go-testing-interface"
 	"github.com/stretchr/testify/require"
 )

command/troubleshoot/upstreams/troubleshoot_upstreams.go

@@ -77,7 +77,7 @@ func (c *cmd) Run(args []string) int {
 		return 1
 	}
 
-	c.UI.HeaderOutput(fmt.Sprintf("Upstreams (explicit upstreams only) (%v)\n", len(envoyIDs)))
+	c.UI.HeaderOutput(fmt.Sprintf("Upstreams (explicit upstreams only) (%v)", len(envoyIDs)))
 	for _, u := range envoyIDs {
 		c.UI.UnchangedOutput(u)
 	}