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

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