Backport of Fix configuration merging for implicit tproxy upstreams. into release/1.14.x#16005
Closed
hc-github-team-consul-core wants to merge 2 commits intorelease/1.14.xfrom backport/derekm/NET-1959/fix-tproxy-upstreams/lightly-exciting-owl
+211-79
