Use proper query method from CloudClient
mapper.opts, not self.opts
Cleaup pprint
Merge pull request #18323 from techhat/cloudclient

Use proper query method from CloudClient