Metadata requests: Fixes bug where certain metadata requests are not retried with a client cold start with only query requests

Metadata requests: Fixes bug where certain metadata requests are not retried with a client cold start with only query requests #5767