Backport of Refactor proxy list
command, ensuring api-gateway Pods are included into release/1.6.x
#4430
+89
−72