[Backport] Fix some query cache key collisions.#4096

gianm merged 1 commit intoapache:0.10.0apache/druid:0.10.0from

gianm:backport-4094-to-0.10.0gianm/druid:backport-4094-to-0.10.0Copy head branch name to clipboard