Modify query handling to internally work like commands

[berka3]

Currently the handling of queries and login/logout functions differs from that of commands. This means that the timeout during query execution includes both waiting for the query to be published and waiting for the result. In contrast, when working with commands, there is a separate timeout for waiting for the command to be published and waiting for the result. Additionally the CompleteableDeferreds for the api error is also handled very differently. Furthermore, the handling of CompleteableDeferreds for Api Errors is also significantly different.