make cluster-list command work with json data that uses "container" or the old "agent" key