Send an HTTP error when there is no query token
Flatten query_server_t::handler
Merge branch 2300 into next

Closes #2300
Review 1452 by @Tryneus