Backport of Refactor proxy list command, ensuring api-gateway Pods are included into release/1.1.x

Backport of Refactor proxy list command, ensuring api-gateway Pods are included into release/1.1.x #2238