Merge pull request #16403 from runcom/fix-containers-json-emtpy-response

Fix GET /containers/json emtpy response regression