cherry-pick of https://github.com/envoyproxy/envoy/pull/12479#252

istio-testing merged 2 commits intoistio:release-1.7istio/envoy:release-1.7from

kyessenov:fix_ecds_slots_17kyessenov/envoy:fix_ecds_slots_17Copy head branch name to clipboard